diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 07:37:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 07:37:17 (GMT) |
| commit | 901bee3cbad3fcf52465d72cd257b4dd87e5b049 (patch) | |
| tree | 9456881308d5807fe7541fd3dac9f20069b2b9a6 /tools | |
| parent | fb7204725ce88f175de6fa986296b42000e692c0 (diff) | |
| parent | 6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29 (diff) | |
| download | Qt-901bee3cbad3fcf52465d72cd257b4dd87e5b049.zip Qt-901bee3cbad3fcf52465d72cd257b4dd87e5b049.tar.gz Qt-901bee3cbad3fcf52465d72cd257b4dd87e5b049.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:
Preparation to enable OpenGLES 2.0 for Windows Mobile.
Test modifications for the Windows Mobile platform.
QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors
Fixed qgl autotest failures on Maemo.
Skip complex FBO tests if combined depth-stencil isn't supported
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qtestlib/wince/cetest/cetest.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/qtestlib/wince/cetest/cetest.pro b/tools/qtestlib/wince/cetest/cetest.pro index 6b6b02a..2773fe4 100644 --- a/tools/qtestlib/wince/cetest/cetest.pro +++ b/tools/qtestlib/wince/cetest/cetest.pro @@ -18,10 +18,13 @@ 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/tools/shared \ + $$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 + +VPATH += $$QT_SOURCE_TREE/tools/shared DEPENDPATH += $$QT_BUILD_TREE/src/corelib/tools $$QT_BUILD_TREE/src/corelib/io @@ -33,6 +36,8 @@ HEADERS += \ SOURCES += \ remoteconnection.cpp \ deployment.cpp \ + symbian/epocroot.cpp \ + windows/registry.cpp \ main.cpp LIBS += ole32.lib advapi32.lib |