diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-03-22 15:55:52 (GMT) |
| commit | 1d8b7f41a5393f77eb3079513b083739edd90b91 (patch) | |
| tree | 232e346dba7226f35af80043e072538dba473201 /tools/qml | |
| parent | 624368f588e555f523fc507986bf3ec80681be48 (diff) | |
| parent | bf95c0ed87bf8a2ccd0a3d57ed81b8ae8fb8c4f2 (diff) | |
| download | Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.zip Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.gz Qt-1d8b7f41a5393f77eb3079513b083739edd90b91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
Diffstat (limited to 'tools/qml')
| -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 |