diff options
| author | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-22 09:32:02 +0300 |
|---|---|---|
| committer | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-26 10:37:41 +0200 |
| commit | e116de6a0d4ccb58435105d2f7ecf5ea80c9541b (patch) | |
| tree | e2aa42f89b7136f3e86a1ff1dce91a5c8459dbfd /src/libraries/qmfclient/support/qmailnamespace.cpp | |
| parent | a5d645d6a7ca026c5e43c54b24891a4b8947e2a5 (diff) | |
Allow parallel installation of qt4 and qt5 builds
Signed-off-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Change-Id: I2c03d287fc871098cf45d75d4a1262b9c6c4378d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Diffstat (limited to 'src/libraries/qmfclient/support/qmailnamespace.cpp')
| -rw-r--r-- | src/libraries/qmfclient/support/qmailnamespace.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libraries/qmfclient/support/qmailnamespace.cpp b/src/libraries/qmfclient/support/qmailnamespace.cpp index 0811d4da..b08dc573 100644 --- a/src/libraries/qmfclient/support/qmailnamespace.cpp +++ b/src/libraries/qmfclient/support/qmailnamespace.cpp @@ -272,7 +272,11 @@ QString QMail::pluginsPath() // default to QMF_INSTALL_ROOT/lib/qmf/plugins, as that's where it will most // likely be. we also search the old fallback (".") via QCoreApplication, // still. +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + return QString::fromUtf8(QMF_INSTALL_ROOT) + "/lib/qmf/plugins5/"; +#else return QString::fromUtf8(QMF_INSTALL_ROOT) + "/lib/qmf/plugins/"; +#endif } /*! |