diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-20 00:09:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-23 11:38:37 +0000 |
| commit | e125a57fe3e5639f912037ba140c8813f0767420 (patch) | |
| tree | b93a41de99bf4f9617cc0d2e193e62fb0d666c47 | |
| parent | 3813b1b94325fc76b7bf45c4dc79b5ea26b05860 (diff) | |
Remove fixupBaseUrl()
No longer needed since qtdeclarative commit b8a3b901 that fixed
QQmlExtensionPlugin::baseUrl() in static builds.
Change-Id: I9a3d04730003c97b9d105593677a2cd588a843f5
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 553060a1..754e76ab 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -96,15 +96,6 @@ QtQuickControls2Plugin::~QtQuickControls2Plugin() QQuickStylePrivate::reset(); } -static QUrl fixupBaseUrl(QQmlExtensionPlugin *plugin) -{ -#ifdef QT_STATIC - return QLatin1String("qrc") + plugin->baseUrl().path(); -#else - return plugin->baseUrl(); -#endif -} - static bool isDefaultStyle(const QString &style) { return style.isEmpty() || style.compare(QStringLiteral("Default"), Qt::CaseInsensitive) == 0; @@ -112,7 +103,7 @@ static bool isDefaultStyle(const QString &style) void QtQuickControls2Plugin::registerTypes(const char *uri) { - QQuickStylePrivate::init(fixupBaseUrl(this)); + QQuickStylePrivate::init(baseUrl()); const QString style = QQuickStyle::name(); if (!style.isEmpty()) |