diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 22:53:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 22:53:22 (GMT) |
| commit | 2653c4fcf42ec93db16a299c29c9fe0f98680c75 (patch) | |
| tree | a1f401c5e2965c8fc08aa5581f84ee87761a6910 /tools | |
| parent | 8b823c4edd51a52c01dec1cb9d44f712346dc583 (diff) | |
| parent | c9832df940516d14ce98031b284a3c87d80aaa80 (diff) | |
| download | Qt-2653c4fcf42ec93db16a299c29c9fe0f98680c75.zip Qt-2653c4fcf42ec93db16a299c29c9fe0f98680c75.tar.gz Qt-2653c4fcf42ec93db16a299c29c9fe0f98680c75.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 FolderListModel test - set folder to one containing files.
Drag over bounds errors when ListView has variable height content
FolderListModel emitted incorrect rowsRemoved range causing crash.
fix/improve docs for new QtQuick 1.1 attributes
Fix test instability.
Document BorderImage::asynchronous
Ensure layout is updated when section property changes.
QDeclarativeDebug: Export needed symbols on Symbian
Add a 'CursorPosition' parameter to TextInput.positionAt().
Fix qmlviewer compilation on old Symbian platforms
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qml.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 2010cc1..cfc74af 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -26,6 +26,8 @@ symbian { !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil SOURCES += $$PWD/deviceorientation_symbian.cpp + } else { + SOURCES += $$PWD/deviceorientation.cpp } FORMS = $$PWD/recopts.ui \ $$PWD/proxysettings.ui |