diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 06:49:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 06:49:12 (GMT) |
| commit | a8fd12aaa34b3f89edb5fa80e7263fbf95b79dd9 (patch) | |
| tree | 1f47a70e230e030d7b389d6fd8a400bbc44bde76 | |
| parent | 3a2be8081b887e63810c332bb820d74b75282b48 (diff) | |
| parent | d2820de2c61c7061943046b8cb678a88466d546e (diff) | |
| download | Qt-a8fd12aaa34b3f89edb5fa80e7263fbf95b79dd9.zip Qt-a8fd12aaa34b3f89edb5fa80e7263fbf95b79dd9.tar.gz Qt-a8fd12aaa34b3f89edb5fa80e7263fbf95b79dd9.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:
Fix for cetest.
| -rw-r--r-- | tools/qtestlib/wince/cetest/cetest.pro | 2 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/qmake_include.pri | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/qtestlib/wince/cetest/cetest.pro b/tools/qtestlib/wince/cetest/cetest.pro index 5cd52cf..6b6b02a 100644 --- a/tools/qtestlib/wince/cetest/cetest.pro +++ b/tools/qtestlib/wince/cetest/cetest.pro @@ -18,7 +18,7 @@ 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_SOURCE_TREE/tools/shared \ $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ $$QT_BUILD_TREE/src/corelib/global diff --git a/tools/qtestlib/wince/cetest/qmake_include.pri b/tools/qtestlib/wince/cetest/qmake_include.pri index aa32653..8b415b0 100644 --- a/tools/qtestlib/wince/cetest/qmake_include.pri +++ b/tools/qtestlib/wince/cetest/qmake_include.pri @@ -5,5 +5,7 @@ SOURCES += \ $$QT_SOURCE_TREE/qmake/option.cpp \ $$QT_SOURCE_TREE/qmake/project.cpp \ $$QT_SOURCE_TREE/qmake/property.cpp \ - $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp + $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp \ + $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp |