diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-02-04 10:37:08 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-13 08:12:23 +0000 |
commit | d28a02aec9a1632f2263d9276099454b33fb6741 (patch) | |
tree | c52ae2dadcb1873d7e65ed0d1312970048f58699 /tests/auto/testplugin | |
parent | 1a5413df3d9a0602f074562e2e92751df369d016 (diff) | |
download | qtquickcontrols-d28a02aec9a1632f2263d9276099454b33fb6741.tar.gz |
Use TabFocusBehavior in QStyleHints in QtQuick.Controls
The all usages of qt_tab_all_widgets in test were updated.
Change-Id: I35393c67f183c4e0695e869553007ea00d38c06a
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/testplugin')
-rw-r--r-- | tests/auto/testplugin/testcppmodels.h | 24 | ||||
-rw-r--r-- | tests/auto/testplugin/testplugin.cpp | 1 |
2 files changed, 0 insertions, 25 deletions
diff --git a/tests/auto/testplugin/testcppmodels.h b/tests/auto/testplugin/testcppmodels.h index 4a74e2de..f5cc6298 100644 --- a/tests/auto/testplugin/testcppmodels.h +++ b/tests/auto/testplugin/testcppmodels.h @@ -40,33 +40,9 @@ #include <QAbstractListModel> #include <QVariant> #include <QtGui/private/qguiapplication_p.h> -#include <qpa/qplatformtheme.h> #include <QtQml/QQmlEngine> #include <QtQml/QJSEngine> -class SystemInfo : public QObject -{ - Q_OBJECT - Q_PROPERTY(bool tabAllWidgets READ tabAllWidgets CONSTANT) - -public: - SystemInfo() {} - bool tabAllWidgets() const { - if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) - return theme->themeHint(QPlatformTheme::TabAllWidgets).toBool(); - return true; - } -}; - -static QObject *systeminfo_provider(QQmlEngine *engine, QJSEngine *scriptEngine) -{ - Q_UNUSED(engine) - Q_UNUSED(scriptEngine) - - SystemInfo *systemInfo = new SystemInfo(); - return systemInfo; -} - class TestObject : public QObject { Q_OBJECT diff --git a/tests/auto/testplugin/testplugin.cpp b/tests/auto/testplugin/testplugin.cpp index 884f2477..cece3939 100644 --- a/tests/auto/testplugin/testplugin.cpp +++ b/tests/auto/testplugin/testplugin.cpp @@ -46,7 +46,6 @@ void TestPlugin::registerTypes(const char *uri) // cpp models qmlRegisterType<TestObject>(uri, 1, 0, "TestObject"); qmlRegisterType<TestItemModel>(uri, 1, 0, "TestItemModel"); - qmlRegisterSingletonType<SystemInfo>(uri, 1, 0, "SystemInfo", systeminfo_provider); } void TestPlugin::initializeEngine(QQmlEngine *engine, const char * /*uri*/) |