Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie3ba29b032c149795efb6abd91b2d65e6e666540

2 files changed, 37 insertions, 8 deletions

diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0
new file mode 100644
index 00000000..9c46cb7f
--- /dev/null
+++ b/dist/changes-5.1.0
@@ -0,0 +1,28 @@
+Qt 5.1 introduces many new features and improvements as well as bugfixes
+over the 5.0.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.1
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - Fix a bug where completed was emitted twice when duration was zero.
+ - Makes QSmoothedAnimation respect zero duration.
+ - Add qmlRegisterType method that allows registration of files to types
+
+ - [QTBUG-29584] Move exports conflicting with QtQml into namespace
+ - [QTBUG-31388] Update all plugins.qmltypes files except webview
+ - [QTCREATORBUG-9232] Move debugger plugins into separate qml1tooling directory
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 8d87c750..2b2bb85a 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -314,17 +314,13 @@ public:
             qSort(exportStrings);
             qml->writeArrayBinding(QLatin1String("exports"), exportStrings);
 
-            // write meta object revisions unless they're all zero
+            // write meta object revisions
             QStringList metaObjectRevisions;
-            bool shouldWriteMetaObjectRevisions = false;
             foreach (const QString &exportString, exportStrings) {
                 int metaObjectRevision = exports[exportString]->metaObjectRevision();
-                if (metaObjectRevision != 0)
-                    shouldWriteMetaObjectRevisions = true;
                 metaObjectRevisions += QString::number(metaObjectRevision);
             }
-            if (shouldWriteMetaObjectRevisions)
-                qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions);
+            qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions);
 
             if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) {
                 // Can happen when a type is registered that returns itself as attachedPropertiesType()
@@ -528,7 +524,7 @@ void sigSegvHandler(int) {
 void printUsage(const QString &appName)
 {
     qWarning() << qPrintable(QString(
-                                 "Usage: %1 [-v] [-notrelocatable] module.uri version [module/import/path]\n"
+                                 "Usage: %1 [-v] [-[non]relocatable] module.uri version [module/import/path]\n"
                                  "       %1 [-v] -path path/to/qmldir/directory [version]\n"
                                  "       %1 [-v] -builtins\n"
                                  "Example: %1 Qt.labs.particles 1.0 /home/user/dev/qt-install/imports").arg(
@@ -579,8 +575,13 @@ int main(int argc, char *argv[])
             }
 
             if (arg == QLatin1String("--notrelocatable")
-                    || arg == QLatin1String("-notrelocatable")) {
+                    || arg == QLatin1String("-notrelocatable")
+                    || arg == QLatin1String("--nonrelocatable")
+                    || arg == QLatin1String("-nonrelocatable")) {
                 relocatable = false;
+            } else if (arg == QLatin1String("--relocatable")
+                        || arg == QLatin1String("-relocatable")) {
+                relocatable = true;
             } else if (arg == QLatin1String("--path")
                        || arg == QLatin1String("-path")) {
                 action = Path;