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 /examples/qtmail/plugins | |
| 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 'examples/qtmail/plugins')
| -rw-r--r-- | examples/qtmail/plugins/composers/email/email.pro | 8 | ||||
| -rw-r--r-- | examples/qtmail/plugins/viewers/generic/generic.pro | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro index 4b8ef1a7..e3c0513d 100644 --- a/examples/qtmail/plugins/composers/email/email.pro +++ b/examples/qtmail/plugins/composers/email/email.pro @@ -2,9 +2,11 @@ TEMPLATE = lib TARGET = emailcomposer CONFIG += qmfclient qmfutil plugin -equals(QT_MAJOR_VERSION, 5): QT += widgets - -target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers +equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers +equals(QT_MAJOR_VERSION, 5) { + target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers + QT += widgets +} DEFINES += PLUGIN_INTERNAL diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro index d020b49d..42f2bcec 100644 --- a/examples/qtmail/plugins/viewers/generic/generic.pro +++ b/examples/qtmail/plugins/viewers/generic/generic.pro @@ -2,9 +2,11 @@ TEMPLATE = lib TARGET = genericviewer CONFIG += qmfclient qmfutil plugin -equals(QT_MAJOR_VERSION, 5): QT += widgets - -target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers +equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers +equals(QT_MAJOR_VERSION, 5){ + target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers + QT += widgets +} # Use webkit to render mail if available contains(QT_CONFIG,webkit){ |