diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
commit | b4ddf0420db30098274986612ca3e8951ef18e2e (patch) | |
tree | a85bdad9b92652b09dd613b2172d5b07d4926d4b /tools/qml/qml.pri | |
parent | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (diff) | |
parent | e1fead7c4f877308c2cc11131c445a1f7085baf7 (diff) | |
download | Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.zip Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.gz Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.bz2 |
Merge branch '4.7' into mimir
Diffstat (limited to 'tools/qml/qml.pri')
-rw-r--r-- | tools/qml/qml.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index e5b2c7f..5db7678 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -29,6 +29,11 @@ symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { SOURCES += $$PWD/deviceorientation_maemo5.cpp FORMS = $$PWD/recopts_maemo5.ui \ $$PWD/proxysettings_maemo5.ui +} else:linux-g++-maemo { + QT += dbus + SOURCES += $$PWD/deviceorientation_harmattan.cpp + FORMS = $$PWD/recopts.ui \ + $$PWD/proxysettings.ui } else { SOURCES += $$PWD/deviceorientation.cpp FORMS = $$PWD/recopts.ui \ |