diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 05:56:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 05:56:02 (GMT) |
| commit | a090c1431eecf2cac553b99fbab326db4e71f6ea (patch) | |
| tree | 94eb2a1f138d7f0725082a09c3cf71e66ab55652 | |
| parent | 9d0ec198801ff93c3848320bb28591739077f7b1 (diff) | |
| parent | 6f63f4a78090f50f40f2c65af85120a715835dab (diff) | |
| download | Qt-a090c1431eecf2cac553b99fbab326db4e71f6ea.zip Qt-a090c1431eecf2cac553b99fbab326db4e71f6ea.tar.gz Qt-a090c1431eecf2cac553b99fbab326db4e71f6ea.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed shadow builds on Unix.
| -rw-r--r-- | qmake/Makefile.unix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index fa98fd6..d4f5849 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -66,7 +66,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \ -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ - -I$(BUILD_PATH)/tools/shared \ + -I$(SOURCE_PATH)/tools/shared \ -DQT_NO_PCRE \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \ -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ |