summaryrefslogtreecommitdiffstats
path: root/tools/qtestlib
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-08-25 03:12:28 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-08-25 04:01:00 (GMT)
commit48887beb4586eaac81b217dd710c43854f350b25 (patch)
treec2e885f99ba493ffd91affe1ea2954b7589be612 /tools/qtestlib
parent7c04a404e5ba63cd9c8bdf1e3c891e796adf2c39 (diff)
downloadQt-48887beb4586eaac81b217dd710c43854f350b25.zip
Qt-48887beb4586eaac81b217dd710c43854f350b25.tar.gz
Qt-48887beb4586eaac81b217dd710c43854f350b25.tar.bz2
Fixed compile of cetest.
Broken in two different ways by the QtScript-JavaScriptCore integration and the S60 integration. Reviewed-by: Michael Goddard
Diffstat (limited to 'tools/qtestlib')
-rw-r--r--tools/qtestlib/wince/cetest/bootstrapped.pri5
-rw-r--r--tools/qtestlib/wince/cetest/cetest.pro3
-rw-r--r--tools/qtestlib/wince/cetest/qmake_include.pri4
3 files changed, 8 insertions, 4 deletions
diff --git a/tools/qtestlib/wince/cetest/bootstrapped.pri b/tools/qtestlib/wince/cetest/bootstrapped.pri
index 3a0ce24..b9c4b2b 100644
--- a/tools/qtestlib/wince/cetest/bootstrapped.pri
+++ b/tools/qtestlib/wince/cetest/bootstrapped.pri
@@ -36,4 +36,7 @@ SOURCES += \
$$QT_SOURCE_TREE/src/corelib/tools/qbitarray.cpp \
$$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \
$$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \
- $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp
+ $$QT_SOURCE_TREE/src/corelib/codecs/qutfcodec.cpp \
+ $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.cpp \
+ $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils.cpp
+
diff --git a/tools/qtestlib/wince/cetest/cetest.pro b/tools/qtestlib/wince/cetest/cetest.pro
index a6b79da..5cd52cf 100644
--- a/tools/qtestlib/wince/cetest/cetest.pro
+++ b/tools/qtestlib/wince/cetest/cetest.pro
@@ -18,9 +18,9 @@ DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED QT_NO_CODECS QT_LITE_UNICODE QT
INCLUDEPATH = \
$$QT_SOURCE_TREE/tools/qtestlib/ce/cetest \
$$QT_SOURCE_TREE/qmake \
+ $$QT_SOURCE_TREE/qmake/generators/symbian \
$$QT_BUILD_TREE/include \
$$QT_BUILD_TREE/include/QtCore \
- $$QT_BUILD_TREE/include/QtScript \
$$QT_BUILD_TREE/src/corelib/global
DEPENDPATH += $$QT_BUILD_TREE/src/corelib/tools $$QT_BUILD_TREE/src/corelib/io
@@ -51,4 +51,3 @@ isEmpty(QT_CE_RAPI_INC) {
include(qmake_include.pri)
include(bootstrapped.pri)
-include($$QT_SOURCE_TREE/src/script/script.pri)
diff --git a/tools/qtestlib/wince/cetest/qmake_include.pri b/tools/qtestlib/wince/cetest/qmake_include.pri
index 3831634..aa32653 100644
--- a/tools/qtestlib/wince/cetest/qmake_include.pri
+++ b/tools/qtestlib/wince/cetest/qmake_include.pri
@@ -4,4 +4,6 @@ HEADERS += \
SOURCES += \
$$QT_SOURCE_TREE/qmake/option.cpp \
$$QT_SOURCE_TREE/qmake/project.cpp \
- $$QT_SOURCE_TREE/qmake/property.cpp
+ $$QT_SOURCE_TREE/qmake/property.cpp \
+ $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+