diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-03 11:16:35 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-03 11:16:35 +0200 |
| commit | 5652acc4ee18416f3b4e11d73bd1c0d5f65add87 (patch) | |
| tree | 1389955a95c3e80756edf8e716aeff1a3c09f20b /tools | |
| parent | 1f9b924c6735fa27adb8fdaf28fde59ee49cefdf (diff) | |
| parent | 26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52 (diff) | |
| download | qtquick1-5652acc4ee18416f3b4e11d73bd1c0d5f65add87.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/declarative/qml/qdeclarativemetatype.cpp
Change-Id: I133752e1df91677925005fa8c1268b32fba312ea
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index cf812859..c2177a4c 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -2,7 +2,7 @@ TARGET = qml1plugindump QT += core-private declarative-private widgets -CONFIG += qpa_minimal_plugin +QTPLUGIN.platforms = qminimal SOURCES += \ main.cpp \ |