From 9ca72e2fef256a1ee225fa176872252897155dd1 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 31 May 2012 05:20:31 +0900 Subject: load plugins properly when QT_NO_SETTINGS is defined Change-Id: I9bc7a3ed70f866c59ba9f72ad3a96b22e6bbf7a6 Reviewed-by: Oswald Buddenhagen --- src/declarative/qml/qdeclarativeimport.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') 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()) { -- cgit v1.2.3