--- a/src/corelib/global/qlibraryinfo.cpp Wed Jun 23 19:07:03 2010 +0300
+++ b/src/corelib/global/qlibraryinfo.cpp Tue Jul 06 15:10:48 2010 +0300
@@ -266,6 +266,11 @@
path = QT_CONFIGURE_PLUGINS_PATH;
break;
#endif
+#ifdef QT_CONFIGURE_IMPORTS_PATH
+ case ImportsPath:
+ path = QT_CONFIGURE_IMPORTS_PATH;
+ break;
+#endif
#ifdef QT_CONFIGURE_DATA_PATH
case DataPath:
path = QT_CONFIGURE_DATA_PATH;
@@ -324,6 +329,10 @@
key = QLatin1String("Plugins");
defaultValue = QLatin1String("plugins");
break;
+ case ImportsPath:
+ key = QLatin1String("Imports");
+ defaultValue = QLatin1String("imports");
+ break;
case DataPath:
key = QLatin1String("Data");
break;
@@ -439,7 +448,7 @@
QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
if (urlRef) {
QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
- return QDir::cleanPath(path + QLatin1String("/Contents/") + ret);
+ return QDir::cleanPath(QString(path) + QLatin1String("/Contents/") + ret);
}
}
#endif
@@ -470,6 +479,7 @@
\value LibrariesPath The location of installed librarires.
\value BinariesPath The location of installed Qt binaries (tools and applications).
\value PluginsPath The location of installed Qt plugins.
+ \value ImportsPath The location of installed QML extensions to import.
\value DataPath The location of general Qt data.
\value TranslationsPath The location of translation information for Qt strings.
\value SettingsPath The location for Qt settings.