summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pro
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2009-08-21 13:23:16 (GMT)
committerIain <qt-info@nokia.com>2009-08-21 13:23:16 (GMT)
commitd2cfe342ff109e7135fe2fcb00f60d918a7bfaa5 (patch)
tree26a2edc99e561721fad57d27f84a2a6c0be73a3c /qmake/qmake.pro
parent6df41a9378e39f4d46cee1a085463d55fe2af5aa (diff)
parentab1df6dea670a60bfef5efd81d6687f9534cfc5d (diff)
downloadQt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.zip
Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.gz
Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.bz2
Merge commit 'origin/master' into symbolVisibility
Diffstat (limited to 'qmake/qmake.pro')
-rw-r--r--qmake/qmake.pro6
1 files changed, 2 insertions, 4 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index acf7718..560aee9 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -17,11 +17,9 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
$$QT_SOURCE_TREE/src/corelib/kernel \
$$QT_SOURCE_TREE/src/corelib/codecs \
$$QT_SOURCE_TREE/src/corelib/plugin \
- $$QT_SOURCE_TREE/src/corelib/io \
$$QT_SOURCE_TREE/src/corelib/xml \
- $$QT_SOURCE_TREE/src/script
+ $$QT_SOURCE_TREE/src/corelib/io
INCPATH += generators generators/unix generators/win32 generators/mac generators/symbian \
- $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore \
- $$QT_SOURCE_TREE/qmake $$QT_SOURCE_TREE/include/QtScript
+ $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore
include(qmake.pri)