diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 14:12:05 +1000 |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 14:12:05 +1000 |
| commit | bf9ca539dc4c5efff801856ad9d3f7e14dabad26 (patch) | |
| tree | a5ae494b6e8a2b33f4345f484ba2ead04aca761e /tools/qml | |
| parent | b254be20c03d4dbfc1803cd40dc95d52115b955c (diff) | |
| parent | a34e2ab6f50cc91a4fca5cd7fd7bd22e6495b0c1 (diff) | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Conflicts:
tools/qml/qml.pri
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qml.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 5397384fd3..2010cc1352 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -19,15 +19,15 @@ SOURCES += $$PWD/qmlruntime.cpp \ RESOURCES = $$PWD/browser/browser.qrc \ $$PWD/startup/startup.qrc -symbian: { - contains(QT_CONFIG, s60): { +symbian { + contains(QT_CONFIG, s60) { LIBS += -lavkon -lcone } !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil SOURCES += $$PWD/deviceorientation_symbian.cpp } - FORMS += $$PWD/recopts.ui \ + FORMS = $$PWD/recopts.ui \ $$PWD/proxysettings.ui } else:maemo5 { QT += dbus |