diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-02-26 15:19:54 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-02-26 15:19:54 (GMT) |
| commit | ed1d9f24d035857438e5bb9ccb423310bc30310b (patch) | |
| tree | ef949d57470b11331a6a2b667f2cdb5467c285cd /qmake | |
| parent | ab9a87eb2a5af0b74834e247f44fb4fad0dfb8cb (diff) | |
| parent | 27e403d9c6185c606980bb7881e39a2c88138a13 (diff) | |
| download | Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.zip Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.tar.gz Qt-ed1d9f24d035857438e5bb9ccb423310bc30310b.tar.bz2 | |
Merge remote branch 'origin/master' into berlin-master
Conflicts:
configure.exe
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.h | 3 | ||||
| -rw-r--r-- | qmake/property.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h index 92689f2..9bfdaed 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -211,7 +211,8 @@ public: TranslationsPath, SettingsPath, DemosPath, - ExamplesPath + ExamplesPath, + ImportsPath }; static QString location(LibraryLocation); }; diff --git a/qmake/property.cpp b/qmake/property.cpp index cab034f..fde7c65 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -95,6 +95,8 @@ QMakeProperty::value(QString v, bool just_check) return QLibraryInfo::location(QLibraryInfo::BinariesPath); else if(v == "QT_INSTALL_PLUGINS") return QLibraryInfo::location(QLibraryInfo::PluginsPath); + else if(v == "QT_INSTALL_IMPORTS") + return QLibraryInfo::location(QLibraryInfo::ImportsPath); else if(v == "QT_INSTALL_TRANSLATIONS") return QLibraryInfo::location(QLibraryInfo::TranslationsPath); else if(v == "QT_INSTALL_CONFIGURATION") @@ -191,6 +193,7 @@ QMakeProperty::exec() specialProps.append("QT_INSTALL_LIBS"); specialProps.append("QT_INSTALL_BINS"); specialProps.append("QT_INSTALL_PLUGINS"); + specialProps.append("QT_INSTALL_IMPORTS"); specialProps.append("QT_INSTALL_TRANSLATIONS"); specialProps.append("QT_INSTALL_CONFIGURATION"); specialProps.append("QT_INSTALL_EXAMPLES"); |