diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
| commit | c6713e212ef0b97c45d6466b73220567e94a05f1 (patch) | |
| tree | 8774d26bf05f2087c510d16da42bfd0dc59a54b1 /src/extras | |
| parent | ce97d9c8ef4e6f8cb2166065b6732cad3cccf604 (diff) | |
| parent | 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 (diff) | |
| download | qtquickcontrols-c6713e212ef0b97c45d6466b73220567e94a05f1.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/Private/qquickmousethief_p.h | 3 | ||||
| -rw-r--r-- | src/extras/Styles/Flat/flatstyleplugin.h | 2 | ||||
| -rw-r--r-- | src/extras/doc/qtquickextras.qdocconf | 4 | ||||
| -rw-r--r-- | src/extras/plugin.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/extras/Private/qquickmousethief_p.h b/src/extras/Private/qquickmousethief_p.h index 80f0d0ea..6f289ff6 100644 --- a/src/extras/Private/qquickmousethief_p.h +++ b/src/extras/Private/qquickmousethief_p.h @@ -41,6 +41,7 @@ #define MOUSETHIEF_H #include <QObject> +#include <QPointer> #include <QtQuick/QQuickItem> class QQuickMouseThief : public QObject @@ -81,7 +82,7 @@ private: void emitReleased(const QPointF &pos); void emitClicked(const QPointF &pos); - QQuickItem *mItem; + QPointer<QQuickItem> mItem; bool mReceivedPressEvent; bool mAcceptCurrentEvent; }; diff --git a/src/extras/Styles/Flat/flatstyleplugin.h b/src/extras/Styles/Flat/flatstyleplugin.h index 0e372439..80261e14 100644 --- a/src/extras/Styles/Flat/flatstyleplugin.h +++ b/src/extras/Styles/Flat/flatstyleplugin.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QtQuickExtrasStylesPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: explicit QtQuickExtrasStylesPlugin(QObject *parent = 0); diff --git a/src/extras/doc/qtquickextras.qdocconf b/src/extras/doc/qtquickextras.qdocconf index 747465fc..f854b89e 100644 --- a/src/extras/doc/qtquickextras.qdocconf +++ b/src/extras/doc/qtquickextras.qdocconf @@ -29,8 +29,8 @@ qhp.QtQuickExtras.subprojects.qtquickextrasexamples.sortPages = true depends = qtqml qtquick qtdoc qtquickcontrols qtgui -exampledirs += ../../../examples/quick/extras -examplesinstallpath = qtquickcontrols/quick/extras +exampledirs += ../../../examples/quickcontrols/extras +examplesinstallpath = qtquickcontrols/quickcontrols/extras headerdirs += ../ diff --git a/src/extras/plugin.h b/src/extras/plugin.h index 9f9e15d8..05855f49 100644 --- a/src/extras/plugin.h +++ b/src/extras/plugin.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QtQuickExtrasPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: explicit QtQuickExtrasPlugin(QObject *parent = 0); |