diff options
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qquickstyle/tst_qquickstyle.cpp | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 5bbbe422..a03cbd06 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -278,6 +278,10 @@ QList<QQuickStylePlugin *> QtQuickControls2Plugin::loadStylePlugins() // release versions of the same Qt libraries (due to the plugin's dependencies). filePath += QStringLiteral("_debug"); #endif // Q_OS_MACOS && QT_DEBUG +#if defined(Q_OS_WIN) && defined(QT_DEBUG) + // Debug versions of plugins have a "d" prefix on Windows. + filePath += QLatin1Char('d'); +#endif // Q_OS_WIN && QT_DEBUG loader.setFileName(filePath); QQuickStylePlugin *stylePlugin = qobject_cast<QQuickStylePlugin *>(loader.instance()); if (stylePlugin) diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp index f5207a96..3f55bcfb 100644 --- a/tests/auto/qquickstyle/tst_qquickstyle.cpp +++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp @@ -39,6 +39,7 @@ #include <QtQml/qqmlcomponent.h> #include <QtQuickControls2/qquickstyle.h> #include <QtQuickControls2/private/qquickstyle_p.h> +#include <QtQuickTemplates2/private/qquicktheme_p.h> #include <QtGui/private/qguiapplication_p.h> #include "../shared/util.h" @@ -102,6 +103,10 @@ void tst_QQuickStyle::lookup() loadControls(); + // The font size for editors in the (default) Normal variant is 16. + // If this is wrong, the style plugin may not have been loaded. + QCOMPARE(QQuickTheme::instance()->font(QQuickTheme::TextArea).pixelSize(), 16); + QCOMPARE(QQuickStyle::name(), QString("Material")); QVERIFY(!QQuickStyle::path().isEmpty()); } |