summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-03-03 23:54:16 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-03-03 23:54:16 (GMT)
commit06e61382f0d6f07798f7db3049f3e185be54efc1 (patch)
tree01d6b2cd2c372ebcc1bc3656d834530aaad86e9c
parent6dec9932b2f17d6b94f1203ae18597d94d5ed976 (diff)
downloadQt-06e61382f0d6f07798f7db3049f3e185be54efc1.zip
Qt-06e61382f0d6f07798f7db3049f3e185be54efc1.tar.gz
Qt-06e61382f0d6f07798f7db3049f3e185be54efc1.tar.bz2
system import path not supported with Qt 4.6.
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index ecaea61..bd67b0b 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1383,7 +1383,11 @@ public:
paths += QFileInfo(base.toLocalFile()).path();
paths += importPath;
paths += QDeclarativeEnginePrivate::get(engine)->environmentImportPath;
+#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
QString builtinPath = QLibraryInfo::location(QLibraryInfo::ImportsPath);
+#else
+ QString builtinPath;
+#endif
if (!builtinPath.isEmpty())
paths += builtinPath;