diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-01 16:17:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 20:24:23 +0200 |
| commit | 095000c898269b66261a4ef117682fcaa36e4292 (patch) | |
| tree | 1754fc9a7c8807fc7c5e71bbcdefb24e69e5d95c /src | |
| parent | 618ea643cafa106ca6d833eccf4bf348171c8f89 (diff) | |
Fix shadow build compilation with MSVC
\#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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/moc/main.cpp | 2 | ||||
| -rw-r--r-- | src/tools/moc/moc.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 5e87632988..08c180f44b 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -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> diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro index 45b063e0b0..62d692844f 100644 --- a/src/tools/moc/moc.pro +++ b/src/tools/moc/moc.pro @@ -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 = . |