Updated build for Harmattan.

diff --git a/deployment.pri b/deployment.pri
index 04b1b16..cc21b2b 100644 (file)
--- a/deployment.pri
+++ b/deployment.pri
@@ -1,4 +1,4 @@
-# checksum 0x2939 version 0x20001
+# checksum 0x838c version 0x70002
 # This file was generated by an application wizard of Qt Creator.
 # The code below handles deployment to Symbian and Maemo, aswell as copying
 # of the application data to shadow build directories on desktop.
@@ -20,10 +20,8 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
 MAINPROFILEPWD = $$PWD
 
 symbian {
-    ICON = $${TARGET}.svg
-    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-    contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone
-    contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 } else:win32 {
     copyCommand =
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
@@ -32,9 +30,17 @@ symbian {
         sourcePathSegments = $$split(source, \\)
         target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
         target = $$replace(target, /, \\)
+        target ~= s,\\\\\\.?\\\\,\\,
         !isEqual(source,$$target) {
             !isEmpty(copyCommand):copyCommand += &&
-            copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
         }
     }
     !isEmpty(copyCommand) {
@@ -47,23 +53,29 @@ symbian {
     }
 } else:unix {
     maemo5 {
-        installPrefix = /opt/usr
+        desktopfile.files = $${TARGET}.desktop
         desktopfile.path = /usr/share/applications/hildon
-    } else {
-        installPrefix = /usr/local
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        desktopfile.files = $${TARGET}_harmattan.desktop
         desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
         copyCommand =
         for(deploymentfolder, DEPLOYMENTFOLDERS) {
             source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
-            source = $$replace(source, \\, /)
+            source = $$replace(source, \\\\, /)
             macx {
                 target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
             } else {
                 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
             }
-            target = $$replace(target, \\, /)
+            target = $$replace(target, \\\\, /)
             sourcePathSegments = $$split(source, /)
             targetFullPath = $$target/$$last(sourcePathSegments)
+            targetFullPath ~= s,/\\.?/,/,
             !isEqual(source,$$targetFullPath) {
                 !isEmpty(copyCommand):copyCommand += &&
                 copyCommand += $(MKDIR) \"$$target\"
@@ -79,26 +91,29 @@ symbian {
             QMAKE_EXTRA_TARGETS += first copydeploymentfolders
         }
     }
+    installPrefix = /opt/$${TARGET}
     for(deploymentfolder, DEPLOYMENTFOLDERS) {
         item = item$${deploymentfolder}
         itemfiles = $${item}.files
         $$itemfiles = $$eval($${deploymentfolder}.source)
         itempath = $${item}.path
-        $$itempath = $${installPrefix}/share/$${TARGET}/$$eval($${deploymentfolder}.target)
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
         export($$itemfiles)
         export($$itempath)
         INSTALLS += $$item
     }
-    icon.files = $${TARGET}.png
-    icon.path = /usr/share/icons/hicolor/64x64/apps
-    desktopfile.files = $${TARGET}.desktop
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+
     target.path = $${installPrefix}/bin
-    export(icon.files)
-    export(icon.path)
-    export(desktopfile.files)
-    export(desktopfile.path)
     export(target.path)
-    INSTALLS += desktopfile icon target
+    INSTALLS += target
 }
 
 export (ICON)

diff --git a/medard.desktop b/medard.desktop
index e011597..827d330 100644 (file)
--- a/medard.desktop
+++ b/medard.desktop
@@ -5,7 +5,7 @@ Type=Application
 Terminal=false
 Name=Medard
 Exec=/opt/medard/bin/medard
-Icon=/usr/share/icons/hicolor/64x64/apps/medard.png
+Icon=medard64
 X-Window-Icon=
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Type=application/x-executable

diff --git a/medard.png b/medard.png
deleted file mode 100644 (file)
index b5d40cd..0000000
Binary files a/medard.png and /dev/null differ

diff --git a/medard.pro b/medard.pro
index 242cead..8de6325 100644 (file)
--- a/medard.pro
+++ b/medard.pro
@@ -1,6 +1,27 @@
-TARGET = medard
-TEMPLATE = app
-VERSION = 0.2.0
+# Add files and directories to ship with the application 
+# by adapting the examples below.
+# file1.source = myfile
+# dir1.source = mydir
+DEPLOYMENTFOLDERS = # file1 dir1
+
+symbian:TARGET.UID3 = 0xE119EAAE
+
+# Smart Installer package's UID
+# This UID is from the protected range 
+# and therefore the package will fail to install if self-signed
+# By default qmake uses the unprotected range value if unprotected UID is defined for the application
+# and 0x2002CCCF value if protected UID is given to the application
+#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
+
+# Allow network access on Symbian
+symbian:TARGET.CAPABILITY += NetworkServices
+
+# If your application uses the Qt Mobility libraries, uncomment
+# the following lines and add the respective components to the 
+# MOBILITY variable. 
+# CONFIG += mobility
+# MOBILITY +=
+CONFIG += meegotouch
 
 QT += network
 
@@ -19,6 +40,17 @@ HEADERS += \
 
 FORMS +=
 
+# Please do not modify the following two lines. Required for deployment.
+include(deployment.pri)
+qtcAddDeployment()
+
+contains(MEEGO_EDITION,harmattan): {
+    MEEGO_VERSION_MAJOR = 1
+    MEEGO_VERSION_MINOR = 2
+    MEEGO_VERSION_PATCH = 0
+    DEFINES += MEEGO_EDITION_HARMATTAN
+}
+
 OTHER_FILES += \
     qtc_packaging/debian_fremantle/rules \
     qtc_packaging/debian_fremantle/README \
@@ -28,6 +60,7 @@ OTHER_FILES += \
     qtc_packaging/debian_fremantle/changelog \
     qtc_packaging/debian_harmattan/rules \
     qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
     qtc_packaging/debian_harmattan/copyright \
     qtc_packaging/debian_harmattan/control \
     qtc_packaging/debian_harmattan/compat \
@@ -38,25 +71,3 @@ TRANSLATIONS += \
     translations/medard_en.ts \
     translations/medard_sk.ts
 
-unix:!symbian {
-    target.path = /opt/medard/bin
-
-    desktop.files = medard.desktop
-
-    icon.files = medard.png
-    icon.path = /usr/share/icons/hicolor/64x64/apps
-
-    translations.files = translations/*.qm
-    translations.path = /opt/medard/share/l10n
-
-    maemo 5 {
-        DEFINES += Q_WS_MAEMO_5
-        desktop.path  = /usr/share/applications/hildon
-    } else {
-        DEFINES += Q_WS_MAEMO_6
-        CONFIG += meegotouch
-        desktop.path  = /usr/share/applications
-    }
-}
-
-INSTALLS += target desktop icon translations
\ No newline at end of file

diff --git a/medard64.png b/medard64.png
new file mode 100644 (file)
index 0000000..b5d40cd
Binary files /dev/null and b/medard64.png differ

diff --git a/medard80.png b/medard80.png
new file mode 100644 (file)
index 0000000..b9d9287
Binary files /dev/null and b/medard80.png differ

diff --git a/medard_harmattan.desktop b/medard_harmattan.desktop
new file mode 100644 (file)
index 0000000..c89762f
--- /dev/null
+++ b/medard_harmattan.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=medard
+Exec=/usr/bin/single-instance /opt/medard/bin/medard
+Icon=/usr/share/icons/hicolor/80x80/apps/medard80.png
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable

diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control
index e714ae5..6ebc46a 100644 (file)
--- a/qtc_packaging/debian_harmattan/control
+++ b/qtc_packaging/debian_harmattan/control
@@ -17,7 +17,7 @@ Description: Weather forecasts from MEDARD project
  weather prediction model MM5 of PSU/NCAR.
  .
  http://www.medard-online.cz/index.php
-XB-Maemo-Display-Name: Medard
+XSBC-Maemo-Display-Name: Medard
 XB-Maemo-Flags: visible
 XSBC-Bugtracker: https://garage.maemo.org/tracker/?func=add&group_id=2093&atid=7102
 XB-Maemo-Icon-26: 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

diff --git a/qtc_packaging/debian_harmattan/manifest.aegis b/qtc_packaging/debian_harmattan/manifest.aegis
new file mode 100644 (file)
index 0000000..c6db2c5
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/manifest.aegis
@@ -0,0 +1,70 @@
+AutoGenerateAegisFile
+<!-- Aegis manifest declares the security credentials required by an
+     application to run correctly. By default, a manifest file will be
+     created or updated automatically as a part of build.
+
+     The detection of required credentials is based on static scan of
+     application binaries. In some cases, the scan may not be able to
+     detect the correct set of permissions. If this is the case, you must
+     declare the credentials required by your application in this file.
+
+     To create a manifest file automatically as a part of build (DEFAULT):
+
+      * Make sure this file starts with the string "AutoGenerateAegisFile" (without quotes).
+      * Alternatively, it can also be completely empty.
+
+     To provide a manifest yourself:
+
+      * List the correct credentials for the application in this file.
+      * Some commented-out examples of often required tokens are provided.
+      * Ensure the path to your application binary given in
+        '<for path="/path/to/app" />' is correct.
+      * Please do not request more credentials than what your application
+        actually requires.
+
+     To disable manifest file:
+
+      * Replace this file with a file starting with the string "NoAegisFile" (without quotes).
+      * Final application package will not contain a manifest.
+
+-->
+<aegis>
+       <request policy="add">
+
+               <!-- Make a GSM call, send text messages (SMS). -->
+       <!--
+               <credential name="Cellular" />
+       -->
+
+               <!-- Access Facebook social data. -->
+       <!--
+               <credential name="FacebookSocial" />
+       -->
+
+               <!-- Read access to data stored in tracker. -->
+       <!--
+               <credential name="TrackerReadAccess" />
+       -->
+
+               <!-- Read and write access to data stored in tracker. -->
+       <!--
+               <credential name="TrackerWriteAccess" />
+       -->
+
+               <!-- Read Location information. -->
+       <!--
+               <credential name="Location" />
+       -->
+
+               <!-- Access to Audio, Multimedia and Camera. -->
+       <!--
+               <credential name="GRP::pulse-access" />
+               <credential name="GRP::video" />
+               <credential name="GRP::audio" />
+       -->
+
+       </request>
+
+       <for path="/opt/medard/bin/medard" />
+       <for path="applauncherd-launcher::/usr/bin/applauncherd.bin" id="" />
+</aegis>

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index 332d996..5a8a1ce 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -12,7 +12,7 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       qmake PREFIX=/opt/medard # Uncomment this line for use without Qt Creator
+       # qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
 
        touch configure-stamp
 
@@ -23,7 +23,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE) # Uncomment this line for use without Qt Creator
+       # $(MAKE) # Uncomment this line for use without Qt Creator
        #docbook-to-man debian/medard.sgml > medard.1
 
        touch $@
@@ -78,7 +78,7 @@ binary-arch: build install
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps # Uncomment this line for use without Qt Creator
+       # dh_shlibdeps # Uncomment this line for use without Qt Creator
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index 6f71c3d..2e69b53 100644 (file)
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MLabel>
 #endif
 
@@ -25,7 +25,7 @@
 
 #include "aboutdialog.h"
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 AboutDialog::AboutDialog(QGraphicsItem *parent) : MMessageBox("", M::OkButton)
 {
     Q_UNUSED(parent);

diff --git a/src/aboutdialog.h b/src/aboutdialog.h
index 34be26c..a6ef1d0 100644 (file)
--- a/src/aboutdialog.h
+++ b/src/aboutdialog.h
@@ -20,13 +20,13 @@
 #ifndef ABOUTDIALOG_H
 #define ABOUTDIALOG_H
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MMessageBox>
 #else
 #include <QDialog>
 #endif
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 class AboutDialog : public MMessageBox
 #else
 class AboutDialog : public QDialog
@@ -35,7 +35,7 @@ class AboutDialog : public QDialog
     Q_OBJECT
 
 public:
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     AboutDialog(QGraphicsItem *parent = 0);
 #else
     AboutDialog(QDialog *parent = 0);

diff --git a/src/forecastwidget.cpp b/src/forecastwidget.cpp
index b65e769..51d9bb8 100644 (file)
--- a/src/forecastwidget.cpp
+++ b/src/forecastwidget.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MLabel>
 #endif
 
@@ -25,7 +25,7 @@
 
 #include "forecastwidget.h"
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 ForecastWidget::ForecastWidget(QGraphicsWidget *parent) : QGraphicsWidget(parent)
 #else
 ForecastWidget::ForecastWidget(QWidget *parent) : QWidget(parent)
@@ -49,7 +49,7 @@ void ForecastWidget::clearImage(bool error)
     update();
 }
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void ForecastWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
     Q_UNUSED(widget);

diff --git a/src/forecastwidget.h b/src/forecastwidget.h
index f352a2a..90ab883 100644 (file)
--- a/src/forecastwidget.h
+++ b/src/forecastwidget.h
@@ -20,7 +20,7 @@
 #ifndef FORECASTWIDGET_H
 #define FORECASTWIDGET_H
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <QGraphicsWidget>
 #else
 #include <QWidget>
@@ -28,7 +28,7 @@
 
 #include <QString>
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 class ForecastWidget : public QGraphicsWidget
 #else
 class ForecastWidget : public QWidget
@@ -37,7 +37,7 @@ class ForecastWidget : public QWidget
     Q_OBJECT
 
 public:
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     ForecastWidget(QGraphicsWidget *parent = 0);
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);

diff --git a/src/main.cpp b/src/main.cpp
index 1a49f53..51b1aba 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MApplication>
 #include <MApplicationWindow>
 #else
@@ -31,7 +31,7 @@
 
 int main(int argc, char *argv[])
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     MApplication app(argc, argv);
 #else
     QApplication app(argc, argv);
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     if (translator.load(translatorFileName, "/opt/medard/share/l10n/"))
         app.installTranslator(&translator);
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     MApplicationWindow window;
     MainWindow page;
     page.appear(&window);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c82f413..f79476c 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MLayout>
 #include <MAction>
 #include <MWidgetAction>
@@ -30,7 +30,7 @@
 #include "aboutdialog.h"
 #include "mainwindow.h"
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 MainWindow::MainWindow(QGraphicsItem *parent) : MApplicationPage(parent)
 {
     m_downloader = new MedardDownloader();
@@ -128,7 +128,7 @@ MainWindow::~MainWindow()
     delete m_downloader;
 }
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void MainWindow::setupUi()
 {
     setAttribute(Qt::WA_LockPortraitOrientation, true);
@@ -203,7 +203,7 @@ void MainWindow::setupUi()
 }
 #endif
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void MainWindow::setupMenu()
 {
     QStringList forecastDomainList;
@@ -318,7 +318,7 @@ void MainWindow::loadSettings()
     int forecastType = settings.value("ForecastType").toInt();
 
     m_downloader->setForecastDomain((MedardDownloader::ForecastDomain) forecastDomain);
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastDomainComboBox->setCurrentIndex(forecastDomain);
 #else
     m_domainActionGroup->actions().at(forecastDomain)->setChecked(true);
@@ -415,7 +415,7 @@ void MainWindow::setForecastDateOffset(int offset)
 
 void MainWindow::seaLevelPreasureMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::SeaLevelPressure);
 #endif
     setForecastType(tr("Sea Level Pressure"), MedardDownloader::SeaLevelPressure);
@@ -423,7 +423,7 @@ void MainWindow::seaLevelPreasureMenuClicked()
 
 void MainWindow::precipitationMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::Precipitation);
 #endif
     setForecastType(tr("Precipitation"), MedardDownloader::Precipitation);
@@ -431,7 +431,7 @@ void MainWindow::precipitationMenuClicked()
 
 void MainWindow::windVelocityMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::WindVelocity);
 #endif
     setForecastType(tr("Wind Velocity"), MedardDownloader::WindVelocity);
@@ -439,7 +439,7 @@ void MainWindow::windVelocityMenuClicked()
 
 void MainWindow::cloudinessMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::Cloudiness);
 #endif
     setForecastType(tr("Cloudiness"), MedardDownloader::Cloudiness);
@@ -447,7 +447,7 @@ void MainWindow::cloudinessMenuClicked()
 
 void MainWindow::temperatureMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::Temperature);
 #endif
     setForecastType(tr("Temperature"), MedardDownloader::Temperature);
@@ -456,7 +456,7 @@ void MainWindow::temperatureMenuClicked()
 void MainWindow::aboutMenuClicked()
 {
     AboutDialog *dialog = new AboutDialog();
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     dialog->appear(MSceneWindow::DestroyWhenDismissed);
 #else
     dialog->exec();
@@ -491,7 +491,7 @@ void MainWindow::minusHourClicked()
     setForecastDateOffset(-1);
 }
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void MainWindow::forecastDomainChanged(int index)
 {
     m_forecast->clearImage(false);

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 46b7cb4..79d9cc6 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -20,7 +20,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MApplicationPage>
 #include <MLabel>
 #include <MButton>
@@ -35,7 +35,7 @@
 #include "forecastwidget.h"
 #include "medarddownloader.h"
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 class MainWindow : public MApplicationPage
 #else
 class MainWindow : public QMainWindow
@@ -44,7 +44,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     MainWindow(QGraphicsItem *parent = 0);
 #else
     MainWindow(QWidget *parent = 0);
@@ -66,7 +66,7 @@ private slots:
     void plusHourClicked();
     void minusHourClicked();
 
-#if Q_WS_MAEMO_6
+#if MEEGO_EDITION_HARMATTAN
     void forecastDomainChanged(int index);
     void forecastTypeChanged(int index);
 #else
@@ -92,7 +92,7 @@ private:
     MedardDownloader *m_downloader;
 
     ForecastWidget *m_forecast;
-#if Q_WS_MAEMO_6
+#if MEEGO_EDITION_HARMATTAN
     MLabel *m_forecastTypeLabel;
     MLabel *m_forecastInitialDateLabel;
     MLabel *m_forecastDateLabel;

diff --git a/src/medarddownloader.cpp b/src/medarddownloader.cpp
index a2ea87a..0e3ad69 100644 (file)
--- a/src/medarddownloader.cpp
+++ b/src/medarddownloader.cpp
@@ -42,7 +42,7 @@
 #define MAX_OFFSET 72
 
 #define IMAGE_WIDTH 556
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #define IMAGE_HEIGHT 369
 #else
 #define IMAGE_HEIGHT 408