diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:29:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:29:41 +0200 |
| commit | c44fd58fecc4672ccd96f6b04dd1903b91467c9f (patch) | |
| tree | 1a3fdd959e570601f8ce40f96245749a8eaba8fc | |
| parent | d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b (diff) | |
| parent | 35179f6b3116f1cee4586faa7c4f751e6d2e00af (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I825ad0d8871ad068d33fe0f3ee3dfdee7679222a
| -rw-r--r-- | src/effects/doc/src/qtgraphicaleffects.qdoc | 6 | ||||
| -rw-r--r-- | src/effects/private/plugin.cpp | 2 | ||||
| -rw-r--r-- | tools/pngdumper/pngdumper.pro | 8 | ||||
| -rw-r--r-- | tools/pngdumper/pngdumper_plugin.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/effects/doc/src/qtgraphicaleffects.qdoc b/src/effects/doc/src/qtgraphicaleffects.qdoc index 32977e5..39c2f54 100644 --- a/src/effects/doc/src/qtgraphicaleffects.qdoc +++ b/src/effects/doc/src/qtgraphicaleffects.qdoc @@ -75,8 +75,10 @@ documentation contains property descriptions and basic usage examples. Currently there is no C++ API. -\section1 Effects +\section1 Reference -The \l{Graphical Effects} page has a list of the effects available. +\list +\li \l {Graphical Effects}{QML Types} +\endlist */ diff --git a/src/effects/private/plugin.cpp b/src/effects/private/plugin.cpp index 8db3c5e..2e5b17a 100644 --- a/src/effects/private/plugin.cpp +++ b/src/effects/private/plugin.cpp @@ -61,7 +61,7 @@ static QObject *qgfxshaderbuilder_provider(QQmlEngine *, QJSEngine *) class QtGraphicalEffectsPrivatePlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: QtGraphicalEffectsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } diff --git a/tools/pngdumper/pngdumper.pro b/tools/pngdumper/pngdumper.pro index 8a6a50b..d29e50f 100644 --- a/tools/pngdumper/pngdumper.pro +++ b/tools/pngdumper/pngdumper.pro @@ -20,11 +20,9 @@ OTHER_FILES = qmldir \ ItemModel.qml !equals(_PRO_FILE_PWD_, $$OUT_PWD) { - copy_qmldir.target = $$OUT_PWD/qmldir - copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir - copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" - QMAKE_EXTRA_TARGETS += copy_qmldir - PRE_TARGETDEPS += $$copy_qmldir.target + cpqmldir.files = qmldir + cpqmldir.path = $$OUT_PWD + COPIES += cpqmldir } qmldir.files = qmldir diff --git a/tools/pngdumper/pngdumper_plugin.h b/tools/pngdumper/pngdumper_plugin.h index c26452f..139cc80 100644 --- a/tools/pngdumper/pngdumper_plugin.h +++ b/tools/pngdumper/pngdumper_plugin.h @@ -34,7 +34,7 @@ class ItemcapturerPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: void registerTypes(const char *uri); |