1 files changed, 27 insertions, 15 deletions

diff --git a/src/extras/Styles/Flat/flatstyleplugin.cpp b/src/extras/Styles/Flat/flatstyleplugin.cpp
index a207f0a0..5d88134b 100644
--- a/src/extras/Styles/Flat/flatstyleplugin.cpp
+++ b/src/extras/Styles/Flat/flatstyleplugin.cpp
@@ -1,34 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Quick Extras module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
 ** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
 ** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -44,9 +47,14 @@
 
 static void initResources()
 {
+#ifndef QT_STATIC
     Q_INIT_RESOURCE(flatstyle);
+#else
+    Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Flat);
+#endif
 }
 
+#ifndef QT_STATIC
 extern "C" {
     Q_DECL_EXPORT bool qt_quick_controls_style_init()
     {
@@ -59,19 +67,23 @@ extern "C" {
         return ":/ExtrasImports/QtQuick/Controls/Styles/Flat";
     }
 }
+#endif
 
 QT_BEGIN_NAMESPACE
 
 QtQuickExtrasStylesPlugin::QtQuickExtrasStylesPlugin(QObject *parent) :
     QQmlExtensionPlugin(parent)
 {
+    initResources();
 }
 
 void QtQuickExtrasStylesPlugin::registerTypes(const char *uri)
 {
-    initResources();
-
-    const QString prefix = "qrc:/ExtrasImports/QtQuick/Controls/Styles/Flat/";
+#ifndef QT_STATIC
+    const QString prefix = "qrc:///ExtrasImports/QtQuick/Controls/Styles/Flat/";
+#else
+    const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Controls/Styles/Flat/";
+#endif
     // register version 1.0
     qmlRegisterSingletonType(QUrl(prefix + "FlatStyle.qml"), uri, 1, 0, "FlatStyle");
     qmlRegisterType(QUrl(prefix + "ApplicationWindowStyle.qml"), uri, 1, 0, "ApplicationWindowStyle");