diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2010-04-08 10:51:38 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2010-04-08 11:30:05 (GMT) |
| commit | 3d320b5a2659022cd9b487d3685fd19bcc4d598c (patch) | |
| tree | c7266502df7c4e25e6df2fb8899506d5f01d9d05 | |
| parent | 5eb8e749bdd60ce93737b96f8f736796dfa77281 (diff) | |
| download | Qt-3d320b5a2659022cd9b487d3685fd19bcc4d598c.zip Qt-3d320b5a2659022cd9b487d3685fd19bcc4d598c.tar.gz Qt-3d320b5a2659022cd9b487d3685fd19bcc4d598c.tar.bz2 | |
Enable setting the imports directory via qt.conf
Task-number: QTBUG-9701
| -rw-r--r-- | doc/src/deployment/qt-conf.qdoc | 1 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index b195889..298f539 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -87,6 +87,7 @@ \row \o Libraries \o \c lib \row \o Binaries \o \c bin \row \o Plugins \o \c plugins + \row \o Imports \o \c imports \row \o Data \o \c . \row \o Translations \o \c translations \row \o Settings \o \c . diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 9490225..3515777 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -329,6 +329,10 @@ QLibraryInfo::location(LibraryLocation loc) key = QLatin1String("Plugins"); defaultValue = QLatin1String("plugins"); break; + case ImportsPath: + key = QLatin1String("Imports"); + defaultValue = QLatin1String("imports"); + break; case DataPath: key = QLatin1String("Data"); break; |