diff --git a/deployment.pri b/deployment.pri index 0d3cd81..0d0e862 100644 --- a/deployment.pri +++ b/deployment.pri @@ -140,8 +140,7 @@ symbian { export(apparmor.files) export(apparmor.path) INSTALLS += manifestfile apparmor - } else:exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): { -# } else:exists("/usr/include/sailfishapp/sailfishapp.h") { + } else:exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): { desktopfile.files = data/sailfishos/$${TARGET}.desktop # Use different desktop file for openrepos openrepos { diff --git a/fahrplan2.pro b/fahrplan2.pro index 8778860..78facee 100644 --- a/fahrplan2.pro +++ b/fahrplan2.pro @@ -2,7 +2,7 @@ APP_NAME = Fahrplan # Define Version -VERSION = 2.0.36-1 +VERSION = 2.0.37-1 # Switch for jolla to separate harbour and openrepo version openrepos { @@ -26,7 +26,6 @@ ubuntu { DEFINES += FAHRPLAN_VERSION=\\\"$$VERSION\\\" DEFINES += FAHRPLAN_SETTINGS_NAMESPACE=\\\"$$APP_ID\\\" } -#exists("/usr/include/sailfishapp/sailfishapp.h"): { exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): { DEFINES += FAHRPLAN_VERSION=\\\"$$VERSION\\\" DEFINES += FAHRPLAN_SETTINGS_NAMESPACE=\\\"harbour-fahrplan2\\\" @@ -324,7 +323,6 @@ blackberry { QML_IMPORT_PATH = 3rdparty/bb10-qt-components/imports } -#exists("/usr/include/sailfishapp/sailfishapp.h"): { exists($$[QT_INSTALL_PREFIX]/include/sailfishapp/sailfishapp.h): { TARGET = harbour-fahrplan2 diff --git a/rpm/harbour-fahrplan2.spec b/rpm/harbour-fahrplan2.spec index 6c57be7..07cde8f 100644 --- a/rpm/harbour-fahrplan2.spec +++ b/rpm/harbour-fahrplan2.spec @@ -13,7 +13,7 @@ Name: harbour-fahrplan2 %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Public transportation application -Version: 2.0.36 +Version: 2.0.37 Release: 1 Group: Location/Location Adaptation License: GPLv2