Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: Ica398d5ef95c836e8c8ac5bc6141720798305fc7

11 files changed, 18 insertions, 9 deletions

diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp
index 18e2ded..c74cd2b 100644
--- a/src/imports/winextras/plugin.cpp
+++ b/src/imports/winextras/plugin.cpp
@@ -49,6 +49,13 @@
 
 #include <QtQml/QtQml>
 
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtWinExtras);
+#endif
+}
+
 QT_BEGIN_NAMESPACE
 
 class QWinExtrasQmlPlugin : public QQmlExtensionPlugin
@@ -57,6 +64,7 @@ class QWinExtrasQmlPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
+    QWinExtrasQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
     void registerTypes(const char *uri) Q_DECL_OVERRIDE
     {
         Q_ASSERT(uri == QLatin1String("QtWinExtras"));
diff --git a/src/imports/winextras/qmldir b/src/imports/winextras/qmldir
index bcba196..f3c244c 100644
--- a/src/imports/winextras/qmldir
+++ b/src/imports/winextras/qmldir
@@ -3,3 +3,4 @@ plugin qml_winextras
 JumpListLink 1.0 JumpListLink.qml
 JumpListDestination 1.0 JumpListDestination.qml
 JumpListSeparator 1.0 JumpListSeparator.qml
+classname QWinExtrasQmlPlugin
diff --git a/src/winextras/doc/images/thumbbar.png b/src/winextras/doc/images/thumbbar.png
index 2f0db6d..c53077d 100644
--- a/src/winextras/doc/images/thumbbar.png
+++ b/src/winextras/doc/images/thumbbar.png
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h
index c1dc340..7190258 100644
--- a/src/winextras/qwinfunctions.h
+++ b/src/winextras/qwinfunctions.h
@@ -89,7 +89,7 @@ namespace QtWin
     Q_WINEXTRAS_EXPORT QString stringFromHresult(HRESULT hresult);
     Q_WINEXTRAS_EXPORT QString errorStringFromHresult(HRESULT hresult);
 
-    Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = 0);
+    Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = Q_NULLPTR);
     Q_WINEXTRAS_EXPORT QColor realColorizationColor();
 
     Q_WINEXTRAS_EXPORT void setWindowExcludedFromPeek(QWindow *window, bool exclude);
diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h
index af637b4..3900998 100644
--- a/src/winextras/qwinjumplist.h
+++ b/src/winextras/qwinjumplist.h
@@ -58,7 +58,7 @@ class Q_WINEXTRAS_EXPORT QWinJumpList : public QObject
     Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier)
 
 public:
-    explicit QWinJumpList(QObject *parent = 0);
+    explicit QWinJumpList(QObject *parent = Q_NULLPTR);
     ~QWinJumpList();
 
     QString identifier() const;
diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h
index 96dcc1c..4685744 100644
--- a/src/winextras/qwintaskbarbutton.h
+++ b/src/winextras/qwintaskbarbutton.h
@@ -59,7 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject
     Q_PROPERTY(QWindow *window READ window WRITE setWindow)
 
 public:
-    explicit QWinTaskbarButton(QObject *parent = 0);
+    explicit QWinTaskbarButton(QObject *parent = Q_NULLPTR);
     ~QWinTaskbarButton();
 
     void setWindow(QWindow *window);
diff --git a/src/winextras/qwintaskbarprogress.h b/src/winextras/qwintaskbarprogress.h
index c73afa2..6b31eef 100644
--- a/src/winextras/qwintaskbarprogress.h
+++ b/src/winextras/qwintaskbarprogress.h
@@ -59,7 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarProgress : public QObject
     Q_PROPERTY(bool stopped READ isStopped NOTIFY stoppedChanged)
 
 public:
-    explicit QWinTaskbarProgress(QObject *parent = 0);
+    explicit QWinTaskbarProgress(QObject *parent = Q_NULLPTR);
     ~QWinTaskbarProgress();
 
     int value() const;
diff --git a/src/winextras/qwinthumbnailtoolbar.h b/src/winextras/qwinthumbnailtoolbar.h
index b5c78c0..4c98c70 100644
--- a/src/winextras/qwinthumbnailtoolbar.h
+++ b/src/winextras/qwinthumbnailtoolbar.h
@@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolBar : public QObject
     Q_PROPERTY(QPixmap iconicLivePreviewPixmap READ iconicLivePreviewPixmap WRITE setIconicLivePreviewPixmap)
 
 public:
-    explicit QWinThumbnailToolBar(QObject *parent = 0);
+    explicit QWinThumbnailToolBar(QObject *parent = Q_NULLPTR);
     ~QWinThumbnailToolBar();
 
     void setWindow(QWindow *window);
diff --git a/src/winextras/qwinthumbnailtoolbutton.h b/src/winextras/qwinthumbnailtoolbutton.h
index ecd57f6..6a14894 100644
--- a/src/winextras/qwinthumbnailtoolbutton.h
+++ b/src/winextras/qwinthumbnailtoolbutton.h
@@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolButton : public QObject
     Q_PROPERTY(bool flat READ isFlat WRITE setFlat)
 
 public:
-    explicit QWinThumbnailToolButton(QObject *parent = 0);
+    explicit QWinThumbnailToolButton(QObject *parent = Q_NULLPTR);
     ~QWinThumbnailToolButton();
 
     void setToolTip(const QString &toolTip);
diff --git a/src/winextras/qwinthumbnailtoolbutton_p.h b/src/winextras/qwinthumbnailtoolbutton_p.h
index 1b34ca5..cc212b3 100644
--- a/src/winextras/qwinthumbnailtoolbutton_p.h
+++ b/src/winextras/qwinthumbnailtoolbutton_p.h
@@ -61,7 +61,7 @@ class QWinThumbnailToolBar;
 class QWinThumbnailToolButtonPrivate
 {
 public:
-    QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(0) {}
+    QWinThumbnailToolButtonPrivate() : enabled(true), interactive(true), dismiss(false), visible(true), flat(false), toolbar(Q_NULLPTR) {}
     QString toolTip;
     QIcon icon;
     bool enabled;
diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro
index 8359473..94bdb92 100644
--- a/src/winextras/winextras.pro
+++ b/src/winextras/winextras.pro
@@ -1,7 +1,5 @@
 TARGET = QtWinExtras
 
-load(qt_module)
-
 QT += gui-private core-private
 
 SOURCES += \
@@ -58,3 +56,5 @@ OTHER_FILES += \
     doc/snippets/code/use-qtwinextras.cpp \
     doc/snippets/code/thumbbar.cpp \
     doc/snippets/code/thumbbar.qml
+
+load(qt_module)