Fix shadow build compilation with MSVC
authorThiago Macieira <thiago.macieira@intel.com>
Thu, 1 Mar 2012 15:17:27 +0000 (16:17 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 29 May 2012 18:24:23 +0000 (20:24 +0200)
\#include "foo" in MSVC does not search the output path, so we need to
pass the proper -I flag to find the build dir's src/corelib/global.

Change-Id: I546051c99fd29d7734f8bf35d058ea283ec9bca7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
src/tools/moc/main.cpp
src/tools/moc/moc.pro

index 5e87632..08c180f 100644 (file)
@@ -42,7 +42,7 @@
 #include "preprocessor.h"
 #include "moc.h"
 #include "outputrevision.h"
-#include "../../corelib/global/qconfig.cpp"
+#include <qconfig.cpp>
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
index 45b063e..62d6928 100644 (file)
@@ -3,7 +3,7 @@ TARGET          = moc
 
 DEFINES         += QT_MOC QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
 DESTDIR         = ../../../bin
-INCLUDEPATH    += . 
+INCLUDEPATH    += . $$OUT_PWD/../../corelib/global
 DEPENDPATH     += .
 LIBS           =
 OBJECTS_DIR    = .