From c2d396db6d74bf2f8f9c8049864f8cec4122a0ce Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 13 Jun 2013 13:32:19 +0200
Subject: [PATCH] Potential fixes for ActiveQt

---
 qgroundcontrol.pri | 3 ++-
 qgroundcontrol.pro | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index 30f3aa6..e3b7f8e 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -301,7 +301,8 @@ win32-msvc2008|win32-msvc2010|win32-msvc2012 {
 
 	INCLUDEPATH += $$BASEDIR/libs/lib/sdl/msvc/include \
         $$BASEDIR/libs/lib/opal/include \
-        $$BASEDIR/libs/lib/msinttypes
+        $$BASEDIR/libs/lib/msinttypes \
+        $$(QTDIR)/src/activeqt/shared
 
 	LIBS += -L$$BASEDIR/libs/lib/sdl/msvc/lib \
         -lSDLmain -lSDL \
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index c6988f3..9990466 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -68,6 +68,7 @@ win32 {
 		system( cd $$(QTDIR)\\src\\activeqt && $$(QTDIR)\\bin\\qmake.exe )
 		system( cd $$(QTDIR)\\src\\activeqt\\container && $$(QTDIR)\\bin\\qmake.exe )
 		system( cd $$(QTDIR)\\src\\activeqt\\control && $$(QTDIR)\\bin\\qmake.exe )
+                system( cd $$(QTDIR)\\src\\activeqt && nmake )
 	}
 }