summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-06-03 11:16:35 +0200
committerSergio Ahumada <sahumada@blackberry.com>2014-06-03 11:16:35 +0200
commit5652acc4ee18416f3b4e11d73bd1c0d5f65add87 (patch)
tree1389955a95c3e80756edf8e716aeff1a3c09f20b /src
parent1f9b924c6735fa27adb8fdaf28fde59ee49cefdf (diff)
parent26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52 (diff)
downloadqtquick1-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 'src')
-rw-r--r--src/declarative/qml/qdeclarativemetatype.cpp26
-rw-r--r--src/declarative/qml/qdeclarativesqldatabase.cpp2
-rw-r--r--src/declarative/util/qdeclarativestategroup.cpp2
3 files changed, 15 insertions, 15 deletions
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)