diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2012-01-02 23:38:29 +0100 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2012-01-02 23:38:29 +0100 |
| commit | 3f95bcc5150d98f38ff5317589016a46fbb505ef (patch) | |
| tree | f973b7bc688aa750ebd0e06196f0d31265dceaf6 | |
| parent | 2b9f2a05435b406e22a0d680b00c81dcf1a34859 (diff) | |
| download | sowatch-3f95bcc5150d98f38ff5317589016a46fbb505ef.tar.gz sowatch-3f95bcc5150d98f38ff5317589016a46fbb505ef.zip | |
Removing QtCreator <2.4 .pro file workarounds
| -rw-r--r-- | ckitcallnotification/ckitcallnotification.pro | 2 | ||||
| -rw-r--r-- | harmaccuweather/harmaccuweather.pro | 2 | ||||
| -rw-r--r-- | meegohandsetnotification/meegohandsetnotification.pro | 2 | ||||
| -rw-r--r-- | metawatch/metawatch.pro | 2 | ||||
| -rw-r--r-- | notificationswatchlet/notificationswatchlet.pro | 4 | ||||
| -rw-r--r-- | qmafwwatchlet/qmafwwatchlet.pro | 2 | ||||
| -rw-r--r-- | qmapwatchlet/qmapwatchlet.pro | 2 | ||||
| -rw-r--r-- | sowatchd/sowatchd.pro | 15 | ||||
| -rw-r--r-- | sysinfowatchlet/sysinfowatchlet.pro | 2 |
9 files changed, 18 insertions, 15 deletions
diff --git a/ckitcallnotification/ckitcallnotification.pro b/ckitcallnotification/ckitcallnotification.pro index 05b37eb..1ba2f52 100644 --- a/ckitcallnotification/ckitcallnotification.pro +++ b/ckitcallnotification/ckitcallnotification.pro @@ -6,7 +6,7 @@ TARGET = ckitcallnotification TEMPLATE = lib -# CONFIG += plugin # Stupid Qt creator doesn't want to deploy plugins +CONFIG += plugin QT += dbus SOURCES += ckitcallplugin.cpp \ diff --git a/harmaccuweather/harmaccuweather.pro b/harmaccuweather/harmaccuweather.pro index 5a1facd..f24c943 100644 --- a/harmaccuweather/harmaccuweather.pro +++ b/harmaccuweather/harmaccuweather.pro @@ -1,6 +1,6 @@ TARGET = harmaccuweather TEMPLATE = lib -# CONFIG += plugin # Qt creator doesn't want to deploy plugins +CONFIG += plugin CONFIG += mobility MOBILITY += systeminfo diff --git a/meegohandsetnotification/meegohandsetnotification.pro b/meegohandsetnotification/meegohandsetnotification.pro index ea87c2c..2ef459d 100644 --- a/meegohandsetnotification/meegohandsetnotification.pro +++ b/meegohandsetnotification/meegohandsetnotification.pro @@ -1,7 +1,7 @@ TARGET = meegohandsetnotification TEMPLATE = lib -# CONFIG += plugin +CONFIG += plugin QT += dbus SOURCES += meegohandsetplugin.cpp \ diff --git a/metawatch/metawatch.pro b/metawatch/metawatch.pro index 45f94ba..9e99da1 100644 --- a/metawatch/metawatch.pro +++ b/metawatch/metawatch.pro @@ -1,6 +1,6 @@ TARGET = metawatchdriver TEMPLATE = lib -# CONFIG += plugin # QtCreator < 2.4 doesn't want to deploy plugins +CONFIG += plugin QT += gui # Qt Mobility 1.2 diff --git a/notificationswatchlet/notificationswatchlet.pro b/notificationswatchlet/notificationswatchlet.pro index 6ec7459..865fa3b 100644 --- a/notificationswatchlet/notificationswatchlet.pro +++ b/notificationswatchlet/notificationswatchlet.pro @@ -1,7 +1,7 @@ TARGET = notificationswatchlet TEMPLATE = lib -# CONFIG += plugin +CONFIG += plugin SOURCES += notificationswatchletplugin.cpp notificationswatchlet.cpp @@ -25,7 +25,7 @@ unix:!symbian { qml_files.path = /opt/sowatch/qml/$$TARGET } else { target.path = /usr/lib/sowatch/watchlets - qml_files.path = /opt/sowatch/qml/$$TARGET + qml_files.path = /usr/share/sowatch/qml/$$TARGET } INSTALLS += target qml_files } diff --git a/qmafwwatchlet/qmafwwatchlet.pro b/qmafwwatchlet/qmafwwatchlet.pro index 2e22b4b..c1f528f 100644 --- a/qmafwwatchlet/qmafwwatchlet.pro +++ b/qmafwwatchlet/qmafwwatchlet.pro @@ -1,7 +1,7 @@ TARGET = qmafwwatchlet TEMPLATE = lib -# CONFIG += plugin +CONFIG += plugin QT += dbus CONFIG += link_pkgconfig unix: PKGCONFIG += qmafw qmafw-shared diff --git a/qmapwatchlet/qmapwatchlet.pro b/qmapwatchlet/qmapwatchlet.pro index 5e5fb81..375861d 100644 --- a/qmapwatchlet/qmapwatchlet.pro +++ b/qmapwatchlet/qmapwatchlet.pro @@ -1,7 +1,7 @@ TARGET = qmapwatchlet TEMPLATE = lib -# CONFIG += plugin +CONFIG += plugin CONFIG += mobility SOURCES += qmapwatchletplugin.cpp qmapwatchlet.cpp diff --git a/sowatchd/sowatchd.pro b/sowatchd/sowatchd.pro index 1ffe3e3..5c195c6 100644 --- a/sowatchd/sowatchd.pro +++ b/sowatchd/sowatchd.pro @@ -25,18 +25,21 @@ else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch INCLUDEPATH += $$PWD/../libsowatch DEPENDPATH += $$PWD/../libsowatch +xml.files = service.xml +INSTALLS += xml + unix { !isEmpty(MEEGO_VERSION_MAJOR)|maemo5 { QMAKE_RPATHDIR += /opt/sowatch/lib target.path = /opt/sowatch/bin + xml.path = /opt/sowatch/xml } else { target.path = /usr/bin + xml.path = /usr/share/sowatch/xml } INSTALLS += target -} -xml.path = /opt/sowatch/xml -xml.files = service.xml -dbus.path = /usr/share/dbus-1/services -dbus.files = com.javispedro.sowatch.service.sowatch-service.service -INSTALLS += xml dbus + dbus.path = /usr/share/dbus-1/services + dbus.files = com.javispedro.sowatch.service.sowatch-service.service + INSTALLS += dbus +} diff --git a/sysinfowatchlet/sysinfowatchlet.pro b/sysinfowatchlet/sysinfowatchlet.pro index b59c54d..329b74b 100644 --- a/sysinfowatchlet/sysinfowatchlet.pro +++ b/sysinfowatchlet/sysinfowatchlet.pro @@ -1,6 +1,6 @@ TARGET = sysinfowatchlet TEMPLATE = lib -# CONFIG += plugin # Qt creator doesn't want to deploy plugins +CONFIG += plugin QT += network # Qt Mobility 1.2 |