diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-24 13:13:02 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-24 13:21:45 +0200 |
| commit | b804244af89313fda33106321fcbc508d6a2e884 (patch) | |
| tree | 95c37321c3458eb11c2649ef08e79162f99a8464 /src | |
| parent | 7a719d3f5c488cf49e28c579300dfbcc70cefb6a (diff) | |
| download | qtquickcontrols-b804244af89313fda33106321fcbc508d6a2e884.tar.gz | |
Remove QtWidgets dependency for WinRT
Change-Id: Ifacceae8690d2ab4dfaed0d5439b9e29804c1943
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Private/private.pri | 2 | ||||
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri index a9205338..a1542395 100644 --- a/src/controls/Private/private.pri +++ b/src/controls/Private/private.pri @@ -22,7 +22,7 @@ SOURCES += \ $$PWD/qquickabstractstyle.cpp -!android: !ios: !blackberry: !qnx: qtHaveModule(widgets) { +!android: !ios: !blackberry: !qnx: !winrt: 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 4ad5cfe2..aea3d141 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -53,7 +53,7 @@ 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) && !defined (Q_OS_QNX) +#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined (Q_OS_BLACKBERRY) && !defined (Q_OS_QNX) && !defined(Q_OS_WINRT) if (QCoreApplication::instance()->inherits("QApplication")) return QLatin1String("Desktop"); #endif |