diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-10-17 16:58:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-17 19:45:05 +0200 |
| commit | 771e2babf6d201f7f6a11c93a59c152896dad8db (patch) | |
| tree | 5b83b8546f624f2b7c77f04020cc5309362bfed9 /src | |
| parent | 0bf5b80baee78f9fc7145304821481556ccba78b (diff) | |
| download | qtquickcontrols-771e2babf6d201f7f6a11c93a59c152896dad8db.tar.gz | |
Remove widget dependency on touch platforms
We don't want native styling on touch enabled devices and there is no
reason to link against widgets there.
Change-Id: I70116a0a94227cb58ae25980b97c4177da75a3c8
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/private.pri | 3 | ||||
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 | ||||
| -rw-r--r-- | src/controls/Private/qquicktooltip.cpp | 6 | ||||
| -rw-r--r-- | src/controls/plugin.cpp | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri index 0c1574aa..6cd9f523 100644 --- a/src/controls/Private/private.pri +++ b/src/controls/Private/private.pri @@ -17,7 +17,8 @@ SOURCES += \ $$PWD/qquickwheelarea.cpp \ $$PWD/qquickabstractstyle.cpp -qtHaveModule(widgets) { + +!android: !ios: !blackberry: qtHaveModule(widgets) { QT += widgets HEADERS += $$PWD/qquickstyleitem_p.h SOURCES += $$PWD/qquickstyleitem.cpp diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index c440f552..fa9fb223 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -50,8 +50,10 @@ QT_BEGIN_NAMESPACE static QString defaultStyleName() { //Only enable QStyle support when we are using QApplication +#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined (Q_OS_BLACKBERRY) if (QCoreApplication::instance()->inherits("QApplication")) return QLatin1String("Desktop"); +#endif return QLatin1String("Base"); } diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp index ae4366d9..e09a6b76 100644 --- a/src/controls/Private/qquicktooltip.cpp +++ b/src/controls/Private/qquicktooltip.cpp @@ -45,7 +45,7 @@ #include <private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> -#ifndef QT_NO_WIDGETS +#ifdef QT_WIDGETS_LIB #include <qtooltip.h> #endif @@ -61,7 +61,7 @@ void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString { if (!item || !item->window()) return; -#ifndef QT_NO_WIDGETS +#ifdef QT_WIDGETS_LIB if (QGuiApplicationPrivate::platformIntegration()-> hasCapability(QPlatformIntegration::MultipleWindows) && QCoreApplication::instance()->inherits("QApplication")) @@ -75,7 +75,7 @@ void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString void QQuickTooltip::hideText() { -#ifndef QT_NO_WIDGETS +#ifdef QT_WIDGETS_LIB QToolTip::hideText(); #endif } diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 0c7f8966..52e7cb0d 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -56,7 +56,7 @@ #include "Private/qquickabstractstyle_p.h" #include "Private/qquickcontrolsprivate_p.h" -#ifndef QT_NO_WIDGETS +#ifdef QT_WIDGETS_LIB #include "Private/qquickstyleitem_p.h" #endif @@ -131,7 +131,8 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri qmlRegisterType<QQuickSpinBoxValidator>(private_uri, 1, 0, "SpinBoxValidator"); qmlRegisterSingletonType<QQuickTooltip>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate::registerTooltipModule); qmlRegisterSingletonType<QQuickControlSettings>(private_uri, 1, 0, "Settings", QQuickControlsPrivate::registerSettingsModule); -#ifndef QT_NO_WIDGETS + +#ifdef QT_WIDGETS_LIB qmlRegisterType<QQuickStyleItem>(private_uri, 1, 0, "StyleItem"); #endif |