diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-31 05:20:31 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 11:48:21 +0200 |
| commit | 9ca72e2fef256a1ee225fa176872252897155dd1 (patch) | |
| tree | 230433d8702a26a4c5be29057fd68835e3e0539b /src/declarative/qml/qdeclarativeimport.cpp | |
| parent | d2af30206f6904fc2c3469691284c7f3c5bbf9ed (diff) | |
load plugins properly when QT_NO_SETTINGS is defined
Change-Id: I9bc7a3ed70f866c59ba9f72ad3a96b22e6bbf7a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeimport.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index b147e1d9..c4324207 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -719,7 +719,6 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath -#ifndef QT_NO_SETTINGS QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtQuick1"); #if defined(Q_OS_SYMBIAN) @@ -754,8 +753,6 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) addImportPath(installImportsPath); #endif -#endif // QT_NO_SETTINGS - // env import paths QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); if (!envImportPath.isEmpty()) { |