diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-08 03:10:38 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-08 03:10:38 (GMT) |
| commit | 3d8db76427efd74e1668b2743381d724453da5d6 (patch) | |
| tree | dfc830e3ef99d6671d55139355071ad83a476bf7 /tools/qml/qml.pri | |
| parent | 76a1804b0fff9ffd092a551defe448d3e9d4346e (diff) | |
| parent | adb496b69a49b2c20eca601fca95839199516962 (diff) | |
| download | Qt-3d8db76427efd74e1668b2743381d724453da5d6.zip Qt-3d8db76427efd74e1668b2743381d724453da5d6.tar.gz Qt-3d8db76427efd74e1668b2743381d724453da5d6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qml/qml.pri')
| -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 0d01f70..fcd0c33 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -25,6 +25,8 @@ maemo5 { $$PWD/proxysettings_maemo5.ui } symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { SOURCES += $$PWD/deviceorientation_symbian.cpp + FORMS = $$PWD/recopts.ui \ + $$PWD/proxysettings.ui } else { SOURCES += $$PWD/deviceorientation.cpp FORMS = $$PWD/recopts.ui \ |