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

Conflicts:
	.qmake.conf
	src/declarative/qml/qdeclarativemetatype.cpp

Change-Id: I133752e1df91677925005fa8c1268b32fba312ea

5 files changed, 43 insertions, 16 deletions

diff --git a/dist/changes-5.3.0 b/dist/changes-5.3.0
new file mode 100644
index 00000000..a8cabc74
--- /dev/null
+++ b/dist/changes-5.3.0
@@ -0,0 +1,27 @@
+Qt 5.3 introduces many new features and improvements as well as bugfixes
+over the 5.2.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
+
+The Qt version 5.3 series is binary compatible with the 5.2.x series.
+Applications compiled for 5.2 will continue to run with 5.3.
+
+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                                        *
+****************************************************************************
+
+QtDeclarative
+-------------
+
+ - TextEdit:
+   * [QTBUG-36069] Fixed TextEdit not vertically aligning its text after
+     having its height changed.
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 81d2f45f..80dac909 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -191,13 +191,13 @@ QDeclarativeTypePrivate::QDeclarativeTypePrivate()
 }
 
 
-QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::RegisterInterface &interface)
+QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::RegisterInterface &iface)
 : d(new QDeclarativeTypePrivate)
 {
     d->m_isInterface = true;
-    d->m_iid = interface.iid;
-    d->m_typeId = interface.typeId;
-    d->m_listId = interface.listId;
+    d->m_iid = iface.iid;
+    d->m_typeId = iface.typeId;
+    d->m_listId = iface.listId;
     d->m_newFunc = 0;
     d->m_index = index;
     d->m_isSetup = true;
@@ -598,9 +598,9 @@ int registerAutoParentFunction(QDeclarativePrivate::RegisterAutoParent &autopare
     return data->parentFunctions.count() - 1;
 }
 
-int registerInterface(const QDeclarativePrivate::RegisterInterface &interface)
+int registerInterface(const QDeclarativePrivate::RegisterInterface &iface)
 {
-    if (interface.version > 0)
+    if (iface.version > 0)
         qFatal("qmlRegisterType(): Cannot mix incompatible QML versions.");
 
     QWriteLocker lock(metaTypeDataLock());
@@ -608,7 +608,7 @@ int registerInterface(const QDeclarativePrivate::RegisterInterface &interface)
 
     int index = data->types.count();
 
-    QDeclarativeType *type = new QDeclarativeType(index, interface);
+    QDeclarativeType *type = new QDeclarativeType(index, iface);
 
     data->types.append(type);
     data->idToType.insert(type->typeId(), type);
@@ -617,12 +617,12 @@ int registerInterface(const QDeclarativePrivate::RegisterInterface &interface)
     if (!type->qmlTypeName().isEmpty())
         data->nameToType.insert(type->qmlTypeName(), type);
 
-    if (data->interfaces.size() <= interface.typeId)
-        data->interfaces.resize(interface.typeId + 16);
-    if (data->lists.size() <= interface.listId)
-        data->lists.resize(interface.listId + 16);
-    data->interfaces.setBit(interface.typeId, true);
-    data->lists.setBit(interface.listId, true);
+    if (data->interfaces.size() <= iface.typeId)
+        data->interfaces.resize(iface.typeId + 16);
+    if (data->lists.size() <= iface.listId)
+        data->lists.resize(iface.listId + 16);
+    data->interfaces.setBit(iface.typeId, true);
+    data->lists.setBit(iface.listId, true);
 
     return index;
 }
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index 4b9e43e1..58e874f1 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -386,7 +386,6 @@ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEng
                 THROW_SQL(VERSION_ERR,QDeclarativeEngine::tr("SQL: database version mismatch"));
         } else {
             created = !QFile::exists(basename+QLatin1String(".sqlite"));
-            database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
             if (created) {
                 ini.setValue(QLatin1String("Name"), dbname);
                 if (dbcreationCallback.isFunction())
@@ -402,6 +401,7 @@ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEng
                 }
                 version = ini.value(QLatin1String("Version")).toString();
             }
+            database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
             database.setDatabaseName(basename+QLatin1String(".sqlite"));
         }
         if (!database.isOpen())
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index c6a70c85..d081115e 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -439,7 +439,7 @@ void QDeclarativeStateGroupPrivate::setCurrentStateInternal(const QString &state
 
     applyingState = true;
 
-    QDeclarativeTransition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state);
+    QDeclarativeTransition *transition = ignoreTrans ? 0 : findTransition(currentState, state);
     if (stateChangeDebug()) {
         qWarning() << this << "Changing state.  From" << currentState << ". To" << state;
         if (transition)
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 \