diff options
author | Damian Jansen <damian.jansen@nokia.com> | 2011-10-19 15:04:15 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 09:01:28 +0200 |
commit | 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb (patch) | |
tree | f264def252b28943e7dda1538ecd73e72746538a /src/plugins | |
parent | 27933ae4ee5741d09b607635213232d94c444633 (diff) |
Remove Q_WS_*, symbian and maemo code in QtDeclarative
Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/plugins')
5 files changed, 2 insertions, 11 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 9d2b67cfb6..0c870bbf2d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -55,5 +55,3 @@ HEADERS += \ target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E90 diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp index cf456ff251..92f34b36e8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp @@ -151,7 +151,7 @@ void ZoomTool::mouseReleaseEvent(QMouseEvent *event) view()->setSceneRect(sceneArea); } else { Qt::KeyboardModifier modifierKey = Qt::ControlModifier; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC modifierKey = Qt::AltModifier; #endif if (event->modifiers() & modifierKey) { diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro index a12fac5da3..c1ca2a5ef9 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro +++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro @@ -8,7 +8,7 @@ QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" SOURCES += \ qmlostplugin.cpp \ - qostdevice.cpp + qostdevice.cpp HEADERS += \ qmlostplugin.h \ @@ -17,5 +17,3 @@ HEADERS += \ target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E92 diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index c5f8f90cd6..8ab507c055 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -16,5 +16,3 @@ HEADERS += \ target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E90 diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index b5c8eaf487..5b735cb716 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -1,7 +1,4 @@ TEMPLATE = subdirs SUBDIRS = qmldbg_tcp - SUBDIRS += qmldbg_inspector - -symbian:SUBDIRS += qmldbg_ost |