diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 13:32:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 13:32:56 (GMT) |
| commit | 5981173f0451736bf2b53e7bf36dbbd02d8f3904 (patch) | |
| tree | 221c1fa02b03c939ce0023653f96c45145b10a85 /tools | |
| parent | 177131d06d0d7a39d5de210ac8ed5dff9ca4999f (diff) | |
| parent | 9e063f7e4790cc15b279a44807ff59c620d53ce6 (diff) | |
| download | Qt-5981173f0451736bf2b53e7bf36dbbd02d8f3904.zip Qt-5981173f0451736bf2b53e7bf36dbbd02d8f3904.tar.gz Qt-5981173f0451736bf2b53e7bf36dbbd02d8f3904.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit auto test failure on windows.
Fix FocusScope example.
Fix compilation on old Symbian platforms
Export symbols from qtestlib required for QtQuickTest
Allow MouseArea to prevent mouse grab begin stolen by Flickable.
Fix QTBUG-17008 XmlListModel blocks Windows system events
Fix TextInput, TextEdit auto test failure on windows and mac.
QDeclarativeDebug: Fix crash when serializing list of QObjects
Update the input context when the pre-edit cursor position changes.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 36915d1..c746d8e 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -50,7 +50,7 @@ # include <QWidgetAction> # include <QStringListModel> # include "ui_recopts_maemo5.h" -#else +#elif !defined(__SERIES60_31__) && !defined(__S60_32__) # include "ui_recopts.h" #endif |