diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 15:24:11 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 15:24:11 +0200 |
| commit | b78012c855a8b00fa0d100cd0cf6c8de024dfa69 (patch) | |
| tree | 75cd20ff9e068c04996daf0d4aed4e15b49b5992 /tools/qtestlib | |
| parent | 5e9382c018e231c5e2ef49dd8a38eaff535b9837 (diff) | |
| parent | 7ca00ed67cb18fb858e1e89cec21b3db696fa923 (diff) | |
Merge branch '4.6'
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'tools/qtestlib')
| -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 5cd52cf2bb..6b6b02aa97 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 aa3265356d..8b415b0bb4 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 |