Potential fixes for ActiveQt

12 years ago · c2d396db6d
2 changed files with 3 additions and 1 deletions
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@ -301,7 +301,8 @@ win32-msvc2008|win32-msvc2010|win32-msvc2012 {
				@@ -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 \
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -68,6 +68,7 @@ win32 {
				@@ -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 )
 	}
 }