diff options
Diffstat (limited to 'plugins/styles/qtuitest/style.cpp')
| -rw-r--r-- | plugins/styles/qtuitest/style.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/styles/qtuitest/style.cpp b/plugins/styles/qtuitest/style.cpp index 8ec1f3a..1b8d75f 100644 --- a/plugins/styles/qtuitest/style.cpp +++ b/plugins/styles/qtuitest/style.cpp @@ -194,13 +194,19 @@ void QtUiTestStylePlugin::initSlave() QStringList QtUiTestStylePlugin::keys() const { - return QStringList() << "QtUiTest"; + return QStringList() << "QtUiTest_NoStyle" << "QtUiTest"; } QStyle *QtUiTestStylePlugin::create(const QString &key) { static bool initialised = false; + if (key.toLower() == "qtuitest_nostyle") { + // QApplication::style() has failed to initialise app style + // so is trying all styles. In this case we DO NOT want the + // QtUiTest style to be initialised unintentionally... + initialised = true; + } if (key.toLower() == "qtuitest" && !initialised) { initSlave(); initialised = true; |
