diff options
| author | Holger Schröder <holger.schroeder.ext@basyskom.de> | 2010-10-25 14:53:32 +0200 |
|---|---|---|
| committer | Holger Schröder <holger.schroeder.ext@basyskom.de> | 2010-10-27 11:40:16 +0200 |
| commit | cd0fe335580d388343e805aa9c9b17eeb17cb524 (patch) | |
| tree | 846e6d1ea9f0372bcfbf7fe873bb43dedb815045 /tools | |
| parent | 2250a5c1bce2d16b7c0c2add96e302a054c7beb3 (diff) | |
Changes: add mAddLibrary function, use it in .pro files
RevBy: Armin, Mirek
Details: To simplify addition of a link library to a
project for the different platforms, we need this function.
Initial patch by Thierry Bastian.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mapplettester/mapplettester.pro | 9 | ||||
| -rw-r--r-- | tools/mapplicationextensiontester/mapplicationextensiontester.pro | 9 | ||||
| -rw-r--r-- | tools/mcssvalidator/mcssvalidator.pro | 10 | ||||
| -rw-r--r-- | tools/mnotificationtool/mnotificationtool.pro | 11 |
4 files changed, 11 insertions, 28 deletions
diff --git a/tools/mapplettester/mapplettester.pro b/tools/mapplettester/mapplettester.pro index 7889832d..019e3845 100644 --- a/tools/mapplettester/mapplettester.pro +++ b/tools/mapplettester/mapplettester.pro @@ -10,11 +10,10 @@ TARGET = mapplettester QT += xml -LIBS += \ - -lmeegotouchcore \ - -lmeegotouchviews \ - -lmeegotouchsettings \ - -lmeegotouchextensions \ +LIBS += $$mAddLibrary(meegotouchcore) \ + $$mAddLibrary(meegotouchviews) \ + $$mAddLibrary(meegotouchsettings) \ + $$mAddLibrary(meegotouchextensions) # Input HEADERS += mapplettester.h \ diff --git a/tools/mapplicationextensiontester/mapplicationextensiontester.pro b/tools/mapplicationextensiontester/mapplicationextensiontester.pro index 1fed2565..f649336c 100644 --- a/tools/mapplicationextensiontester/mapplicationextensiontester.pro +++ b/tools/mapplicationextensiontester/mapplicationextensiontester.pro @@ -6,11 +6,10 @@ DEPENDPATH += $$INCLUDEPATH TEMPLATE = app TARGET = mapplicationextensiontester -LIBS += \ - -lmeegotouchcore \ - -lmeegotouchviews \ - -lmeegotouchsettings \ - -lmeegotouchextensions \ +LIBS += $$mAddLibrary(meegotouchcore) \ + $$mAddLibrary(meegotouchviews) \ + $$mAddLibrary(meegotouchsettings) \ + $$mAddLibrary(meegotouchextensions) # Input HEADERS += mapplicationextensiontester.h diff --git a/tools/mcssvalidator/mcssvalidator.pro b/tools/mcssvalidator/mcssvalidator.pro index 4a85eccd..512f07cf 100644 --- a/tools/mcssvalidator/mcssvalidator.pro +++ b/tools/mcssvalidator/mcssvalidator.pro @@ -7,15 +7,7 @@ INCLUDEPATH += . \ ../../src/corelib/notification DEPENDPATH += $$INCLUDEPATH -win32|macx { - macx { - QMAKE_LFLAGS += -F../../lib - LIBS += -framework m - } - win32:LIBS += -lmeegotouchcore0 -} else { - LIBS += -lmeegotouchcore -} +LIBS += $$mAddLibrary(meegotouchcore) SOURCES += mcssvalidator.cpp target.path = $$M_INSTALL_BIN diff --git a/tools/mnotificationtool/mnotificationtool.pro b/tools/mnotificationtool/mnotificationtool.pro index e4ce3141..882519bf 100644 --- a/tools/mnotificationtool/mnotificationtool.pro +++ b/tools/mnotificationtool/mnotificationtool.pro @@ -8,15 +8,8 @@ INCLUDEPATH += . \ DEPENDPATH += $$INCLUDEPATH -win32|macx { - macx { - QMAKE_LFLAGS += -F../../lib - LIBS += -framework m - } - win32:LIBS += -lmeegotouchcore0 -} else { - LIBS += -lmeegotouchcore -} + +LIBS += $$mAddLibrary(meegotouchcore) SOURCES += mnotificationtool.cpp target.path = $$M_INSTALL_BIN |