diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-21 04:41:38 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 01:45:12 (GMT) |
| commit | 15ebe8a375542826278aac2b920f0e3dac3ffaea (patch) | |
| tree | 6c1334b03b9f426a88a91faccfcd43c32cc5b498 /tools/qml | |
| parent | 5fa90e4bc83541dc23db150166157e2a3f04a668 (diff) | |
| download | Qt-15ebe8a375542826278aac2b920f0e3dac3ffaea.zip Qt-15ebe8a375542826278aac2b920f0e3dac3ffaea.tar.gz Qt-15ebe8a375542826278aac2b920f0e3dac3ffaea.tar.bz2 | |
Another stab at fixing compilation on old Symbian platforms
Task-number: QTBUG-17472
Reviewed-by: Martin Jones
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qml.pri | 6 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 08cd506..5397384 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -25,12 +25,10 @@ symbian: { } !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil - } - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2): { SOURCES += $$PWD/deviceorientation_symbian.cpp - FORMS = $$PWD/recopts.ui \ - $$PWD/proxysettings.ui } + FORMS += $$PWD/recopts.ui \ + $$PWD/proxysettings.ui } else:maemo5 { QT += dbus HEADERS += $$PWD/texteditautoresizer_maemo5.h diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index c746d8e..36915d1 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -50,7 +50,7 @@ # include <QWidgetAction> # include <QStringListModel> # include "ui_recopts_maemo5.h" -#elif !defined(__SERIES60_31__) && !defined(__S60_32__) +#else # include "ui_recopts.h" #endif |