From 6c06ce0fdca1b3aee1700ef934398c1a95576bd6 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 17 Apr 2014 17:24:55 +0200 Subject: Bump MODULE_VERSION to 5.3.1 Change-Id: Ifb2361ae4fe8e6d6e2f06dc20cb4c7b4739a7021 Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index efd0e68f..ef45a002 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.3.0 +MODULE_VERSION = 5.3.1 -- cgit v1.2.3 From 96c2c1aff15d81a131c2f8ee6019d7a9cddf21fc Mon Sep 17 00:00:00 2001 From: Alan Alpert <416365416c@gmail.com> Date: Wed, 23 Apr 2014 20:26:49 -0700 Subject: Add 5.3 Changelog There was a bug fixed for this release. Change-Id: I428a01111874c70d2151213d2b3c555444333aaa Reviewed-by: Thiago Macieira --- dist/changes-5.3.0 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 dist/changes-5.3.0 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. -- cgit v1.2.3 From fc0ae9f3c325936a77e5efaeeabccb56f8919ee8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 5 May 2014 12:38:17 +0200 Subject: qmlplugindump: Fix platform plugin specification. Fix warning: Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead. Change-Id: I33330bdbe7639de777b4f0fedd4ecadd184733bf Reviewed-by: Oswald Buddenhagen --- tools/qmlplugindump/qmlplugindump.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ -- cgit v1.2.3 From 3ef7c3fc56d41f0028e7ee822abd95fe5c21bd7e Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 1 May 2014 14:54:02 -0700 Subject: Don't use a variable called 'interface' MSVC has #define interface struct, resulting in a nonsensical error from the compiler about "struct: missing tag name" in a line that doesn't say "struct". Change-Id: I1ca703fd7920052e9d0bdf9a6936df77597ff022 Reviewed-by: Simon Hausmann --- src/declarative/qml/qdeclarativemetatype.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index d90ccad8..29f4b518 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; } -- cgit v1.2.3 From 4b7a0a071728233b1dbb89d59a8253a32c020007 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 14 May 2014 13:35:04 +0200 Subject: Fix copy and paste error Fix error 13 identified by static analysis from http://www.viva64.com/en/b/0251/ This is in line with qtdeclarative. Change-Id: I3d3879bb93f9ae5bdcdd583645b1657f55140fdf Reviewed-by: Friedemann Kleint --- src/declarative/util/qdeclarativestategroup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 341e708e..5573f49d 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) -- cgit v1.2.3 From 26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52 Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Tue, 22 Apr 2014 00:19:50 -0500 Subject: Don't add the database before verification The local storage facility exposed to QML has a bug; if you attempt to open a versioned connection, the version is wrong, and you try to handle that error, the connection is still stored in a connection pool, but in an unopened state. The next time you attempt to connect, no matter if you have the version right or not, the database handle will complain about being unopened. See also http://qt-project.org/forums/viewthread/38458/ Task-number: QTBUG-38543 Change-Id: I597497aab4895c868275a247ad96fb969e1c8ae5 Reviewed-by: Lars Knoll --- src/declarative/qml/qdeclarativesqldatabase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()) -- cgit v1.2.3