diff options
| author | Bill King <bking@trolltech.com> | 2010-02-22 06:20:59 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-22 06:20:59 (GMT) |
| commit | 0afed6da3d040814a686b507a981b0fc7eb14c32 (patch) | |
| tree | 1eef631448466654ac845d77d592bef4d7c92c98 /qmake | |
| parent | 30ae64eaf42a2d7f80f70fb01c77a6ebcdfd1e98 (diff) | |
| parent | 6f63f4a78090f50f40f2c65af85120a715835dab (diff) | |
| download | Qt-0afed6da3d040814a686b507a981b0fc7eb14c32.zip Qt-0afed6da3d040814a686b507a981b0fc7eb14c32.tar.gz Qt-0afed6da3d040814a686b507a981b0fc7eb14c32.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'qmake')
| -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 \ |