diff options
| author | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-29 15:43:18 +0300 |
|---|---|---|
| committer | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-04-30 10:17:03 +0200 |
| commit | aac25505a15d9f9a2367251f5ff6b153d5beecd3 (patch) | |
| tree | 209863f22866d354725821c846882a58c08dc243 /examples/qtmail | |
| parent | e116de6a0d4ccb58435105d2f7ecf5ea80c9541b (diff) | |
Make sure plugins are linked against correct Qt version of the qmf libs.
Signed-off-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Change-Id: I965b6f890c883e82e946f008501d0bdc669c9a2b
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'examples/qtmail')
| -rw-r--r-- | examples/qtmail/libs/qmfutil/qmfutil.pro | 6 | ||||
| -rw-r--r-- | examples/qtmail/plugins/composers/email/email.pro | 6 | ||||
| -rw-r--r-- | examples/qtmail/plugins/viewers/generic/generic.pro | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/examples/qtmail/libs/qmfutil/qmfutil.pro b/examples/qtmail/libs/qmfutil/qmfutil.pro index 02d286f4..9fef6ba4 100644 --- a/examples/qtmail/libs/qmfutil/qmfutil.pro +++ b/examples/qtmail/libs/qmfutil/qmfutil.pro @@ -1,10 +1,14 @@ TEMPLATE = lib CONFIG += warn_on CONFIG += qmfclient -equals(QT_MAJOR_VERSION, 4): TARGET = qmfutil +equals(QT_MAJOR_VERSION, 4) { + TARGET = qmfutil + LIBS += -lqmfclient +} equals(QT_MAJOR_VERSION, 5){ TARGET = qmfutil5 QT += widgets + LIBS += -lqmfclient5 } target.path += $$QMF_INSTALL_ROOT/lib diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro index e3c0513d..9528b2c2 100644 --- a/examples/qtmail/plugins/composers/email/email.pro +++ b/examples/qtmail/plugins/composers/email/email.pro @@ -2,10 +2,14 @@ TEMPLATE = lib TARGET = emailcomposer CONFIG += qmfclient qmfutil plugin -equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers +equals(QT_MAJOR_VERSION, 4) { + target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers + LIBS += -lqmfclient -lqmfutil +} equals(QT_MAJOR_VERSION, 5) { target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers QT += widgets + LIBS += -lqmfclient5 -lqmfutil5 } DEFINES += PLUGIN_INTERNAL diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro index 42f2bcec..e5d45415 100644 --- a/examples/qtmail/plugins/viewers/generic/generic.pro +++ b/examples/qtmail/plugins/viewers/generic/generic.pro @@ -2,10 +2,14 @@ TEMPLATE = lib TARGET = genericviewer CONFIG += qmfclient qmfutil plugin -equals(QT_MAJOR_VERSION, 4): target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers -equals(QT_MAJOR_VERSION, 5){ +equals(QT_MAJOR_VERSION, 4) { + target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers + LIBS += -lqmfclient -lqmfutil +} +equals(QT_MAJOR_VERSION, 5) { target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers QT += widgets + LIBS += -lqmfclient5 -lqmfutil5 } # Use webkit to render mail if available |