diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2011-03-21 14:13:16 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 14:13:16 (GMT) |
| commit | 84a342eea111f0a1da8fd0c417362aae2b851e56 (patch) | |
| tree | 9ca77440d6503412408b5111d293dea088b8ffda /src/declarative/qml | |
| parent | 55650943492ff00d086bc76039212ce8438ee203 (diff) | |
| download | Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.zip Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.tar.gz Qt-84a342eea111f0a1da8fd0c417362aae2b851e56.tar.bz2 | |
Fix compilation with QT_NO_
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 8 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativesqldatabase.cpp | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 7a1234d..e8d593f 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -722,6 +722,7 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath +#ifndef QT_NO_SETTINGS QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); #if defined(Q_OS_SYMBIAN) @@ -748,6 +749,9 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) #else addImportPath(installImportsPath); #endif + +#endif // QT_NO_SETTINGS + // env import paths QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); if (!envImportPath.isEmpty()) { @@ -1014,6 +1018,7 @@ bool QDeclarativeImportDatabase::importPlugin(const QString &filePath, const QSt if (qmlImportTrace()) qDebug().nospace() << "QDeclarativeImportDatabase::importPlugin: " << uri << " from " << filePath; +#ifndef QT_NO_LIBRARY QFileInfo fileInfo(filePath); const QString absoluteFilePath = fileInfo.absoluteFilePath(); @@ -1065,6 +1070,9 @@ bool QDeclarativeImportDatabase::importPlugin(const QString &filePath, const QSt } return true; +#else + return false; +#endif } diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp index 207fb57..4ed2bba 100644 --- a/src/declarative/qml/qdeclarativesqldatabase.cpp +++ b/src/declarative/qml/qdeclarativesqldatabase.cpp @@ -309,8 +309,10 @@ static QScriptValue qmlsqldatabase_change_version(QScriptContext *context, QScri if (ok) { context->thisObject().setProperty(QLatin1String("version"), to_version, QScriptValue::ReadOnly); +#ifndef QT_NO_SETTINGS QSettings ini(qmlsqldatabase_databaseFile(db.connectionName(),engine) + QLatin1String(".ini"), QSettings::IniFormat); ini.setValue(QLatin1String("Version"), to_version); +#endif } return engine->undefinedValue(); @@ -355,6 +357,7 @@ static QScriptValue qmlsqldatabase_read_transaction(QScriptContext *context, QSc */ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEngine *engine) { +#ifndef QT_NO_SETTINGS qmlsqldatabase_initDatabasesPath(engine); QSqlDatabase database; @@ -418,6 +421,9 @@ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEng } return result; +#else + return engine->undefinedValue(); +#endif // QT_NO_SETTINGS } void qt_add_qmlsqldatabase(QScriptEngine *engine) |