summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2013-12-03 00:36:00 +0100
committerTomasz Olszak <olszak.tomasz@gmail.com>2014-12-17 22:49:58 +0100
commit4ac58b1a0d040a73e2b930fad1cb924ca4701005 (patch)
treecdda0ee88a7ec42fb3a83e6ab6dc9ec77da838b5
parentea099e341b5f8845be56f81b22e44a8b6cb227a2 (diff)
downloadqtquickcontrols-wip/tizen.tar.gz
Tizen: Settings.hasTouchScreen returns true on Tizen.wip/tizen
Change-Id: I818bff2fcc416215c07b65e6714fcc995e9d3409 Reviewed-by: Jarosław Staniek <staniek@kde.org>
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index eca533d7..6428dacd 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
static QString defaultStyleName()
{
//Only enable QStyle support when we are using QApplication
-#if defined(QT_WIDGETS_LIB) && !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_QNX) && !defined(Q_OS_WINRT)
+#if defined(QT_WIDGETS_LIB) && !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_QNX) && !defined(Q_OS_WINRT) && !defined(Q_OS_LINUX_TIZEN)
if (QCoreApplication::instance()->inherits("QApplication"))
return QLatin1String("Desktop");
#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
@@ -76,7 +76,7 @@ static bool fromResource(const QString &path)
bool QQuickControlSettings::hasTouchScreen() const
{
// QTBUG-36007
-#if defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX_TIZEN)
return true;
#else
foreach (const QTouchDevice *dev, QTouchDevice::devices())