diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-01-21 10:19:09 +0100 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2014-01-23 19:52:39 +0100 |
| commit | 1d48985c25e4dbf700d65da5761dc2859b5c6cfc (patch) | |
| tree | 409dcb064982bab3cf8cf04f005a680437fb1966 /examples/qtmail/plugins | |
| parent | 8fd59a4d2f87c76dbd85d05cf81b96a4566ccc8c (diff) | |
Make qmfutil a Qt module: QmfWidgets.
I'm not totally clear how useful this thing actually is, but instead of
bastardising it across a few examples/projects, let's promote it to a module and
avoid that black magic.
Change-Id: I4d34961bc30e01455274afdd344286f4e5cfd25a
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'examples/qtmail/plugins')
| -rw-r--r-- | examples/qtmail/plugins/composers/email/email.pro | 16 | ||||
| -rw-r--r-- | examples/qtmail/plugins/viewers/generic/generic.pro | 12 |
2 files changed, 2 insertions, 26 deletions
diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro index c2fa7eb0..e0b20baa 100644 --- a/examples/qtmail/plugins/composers/email/email.pro +++ b/examples/qtmail/plugins/composers/email/email.pro @@ -3,24 +3,10 @@ TARGET = emailcomposer CONFIG += plugin target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers -QT += widgets qmfclient -macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfutil5 -} else { - LIBS += -lqmfutil5 -} +QT += widgets qmfclient qmfwidgets DEFINES += PLUGIN_INTERNAL -DEPENDPATH += . - -INCLUDEPATH += . ../../../libs/qmfutil - -LIBS += -L../../../libs/qmfutil/build - -macx:LIBS += -F../../../libs/qmfutil/build - - HEADERS += emailcomposer.h \ attachmentlistwidget.h diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro index 8540a222..cce061d9 100644 --- a/examples/qtmail/plugins/viewers/generic/generic.pro +++ b/examples/qtmail/plugins/viewers/generic/generic.pro @@ -3,12 +3,7 @@ TARGET = genericviewer CONFIG += plugin target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers -QT += widgets qmfclient -macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfutil5 -} else { - LIBS += -lqmfutil5 -} +QT += widgets qmfclient qmfwidgets # Use webkit to render mail if available contains(QT_CONFIG,webkit){ @@ -18,11 +13,6 @@ contains(QT_CONFIG,webkit){ DEPENDPATH += . -INCLUDEPATH += . ../../../libs/qmfutil - -LIBS += -L../../../libs/qmfutil/build -LIBS += -F../../../libs/qmfutil/build - HEADERS += attachmentoptions.h browserwidget.h genericviewer.h SOURCES += attachmentoptions.cpp browserwidget.cpp genericviewer.cpp |