summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-19 08:21:09 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-19 08:21:09 (GMT)
commitf92e8dd88909200418985c519dab08023d73dc0c (patch)
treec5b974eb44c1dfb7b9a3e679d63bcf5a387703d5
parent52e14a2d02d1d664bd8b981d261db0a62592efb8 (diff)
downloadQt-f92e8dd88909200418985c519dab08023d73dc0c.zip
Qt-f92e8dd88909200418985c519dab08023d73dc0c.tar.gz
Qt-f92e8dd88909200418985c519dab08023d73dc0c.tar.bz2
remove QtScript from includepath
qmake no longer uses QtScript.
-rw-r--r--qmake/Makefile.unix2
-rw-r--r--qmake/Makefile.win321
-rw-r--r--qmake/Makefile.win32-g++1
-rw-r--r--qmake/Makefile.win32-g++-sh1
4 files changed, 1 insertions, 4 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 9f32731..0d07cc3 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -57,7 +57,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(BUILD_PATH)/src/corelib/global \
- -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
+ -DQT_NO_PCRE \
-DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 2795d5d..3aa3ea2 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -32,7 +32,6 @@ CFLAGS = -c -Fo$@ \
-I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
-I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
-I$(BUILD_PATH)\src\corelib\global \
- -I$(BUILD_PATH)\include\QtScript \
-I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
-DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP -DQT_BUILD_QMAKE -DQT_NO_THREAD \
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 644cd64..9ef17d1 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -18,7 +18,6 @@ CFLAGS = -c -o$@ -O \
-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
-I$(BUILD_PATH)/src/corelib/global \
- -I$(BUILD_PATH)/include/QtScript \
-I$(SOURCE_PATH)/mkspecs/win32-g++ \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index ef691a9..00e61a3 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -18,7 +18,6 @@ CFLAGS = -c -o$@ -O \
-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
-I$(BUILD_PATH)/src/corelib/global \
- -I$(BUILD_PATH)/include/QtScript \
-I$(SOURCE_PATH)/mkspecs/win32-g++ \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \