diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-01-21 10:19:06 +0100 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2014-01-23 19:51:24 +0100 |
| commit | 8fd59a4d2f87c76dbd85d05cf81b96a4566ccc8c (patch) | |
| tree | f930ebf22fbc7b99129baaf1546137c9abec37ea /examples/messagingaccounts | |
| parent | 3abb395592bdac9c8166efa0e785c0424b9ca219 (diff) | |
Convert qmfclient & qmfmessageserver into Qt modules: QmfClient & QmfMessageServer.
This was not possible prior to now due to Qt 4 support hanging around like the
undead vampire it is, but now we purged it with fire and light, and the build
system looks a lot less like a stinky, decomposed corpse.
There's still a lot of surprises lurking: qtmail is one such surprise. I don't
quite grasp why it's so heavy on plugins, and qmfutil also needs some...
attention. But at least it's a start.
As part of this work, we rename the qcop headers to fit the private convention.
This could have been done in a prior commit, but given that I didn't have an
easy way to build prior to this commit, I opted to roll them together.
Change-Id: Ia3e288ffc3639a7751c9040ceecb54fca77a31b1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Diffstat (limited to 'examples/messagingaccounts')
| -rw-r--r-- | examples/messagingaccounts/messagingaccounts.pro | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/examples/messagingaccounts/messagingaccounts.pro b/examples/messagingaccounts/messagingaccounts.pro index 9ab6dd36..c4b72738 100644 --- a/examples/messagingaccounts/messagingaccounts.pro +++ b/examples/messagingaccounts/messagingaccounts.pro @@ -1,34 +1,17 @@ TEMPLATE = app target.path += $$QMF_INSTALL_ROOT/bin -CONFIG += qmfclient qmfmessageserver TARGET = messagingaccounts5 -QT += widgets - -macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfmessageserver5 -framework qmfclient5 -} else { - LIBS += -lqmfmessageserver5 -lqmfclient5 -} - -DEPENDPATH += . +QT += widgets qmfclient qmfmessageserver QTMAIL_EXAMPLE=../qtmail #Required to build on windows DEFINES += QMFUTIL_INTERNAL -INCLUDEPATH += . ../../src/libraries/qmfclient \ - ../../src/libraries/qmfclient/support \ - ../../src/libraries/qmfmessageserver \ +INCLUDEPATH += \ $$QTMAIL_EXAMPLE/app \ $$QTMAIL_EXAMPLE/libs/qmfutil -LIBS += -L../../src/libraries/qmfclient/build \ - -L../../src/libraries/qmfmessageserver/build - -macx:LIBS += -F../../src/libraries/qmfclient/build \ - -F../../src/libraries/qmfmessageserver/build - HEADERS += $$QTMAIL_EXAMPLE/app/accountsettings.h \ $$QTMAIL_EXAMPLE/app/editaccount.h \ $$QTMAIL_EXAMPLE/app/statusbar.h \ |