summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-01 09:23:51 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-03-01 09:23:51 (GMT)
commitee767e8c16742316068e83323374ea54f2b939cb (patch)
treebb3f6c94e6c1512545cd657d2c675a371a6a88f7 /tools
parent54869c8727e5403cea866c99a5f83ae9c8533f82 (diff)
parent2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff)
downloadQt-ee767e8c16742316068e83323374ea54f2b939cb.zip
Qt-ee767e8c16742316068e83323374ea54f2b939cb.tar.gz
Qt-ee767e8c16742316068e83323374ea54f2b939cb.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts: src/gui/text/qfontengine_mac.mm src/opengl/qpixmapdata_gl.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/qml.pri2
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