Preparing SailTime for harbour deployment.
Runs in the emulator now but probably won't deploy or pass harbour compliance yet.
This commit is contained in:
parent
05c76f4871
commit
da24e0ca95
6 changed files with 31 additions and 28 deletions
|
@ -6,22 +6,23 @@
|
||||||
# - desktop icon filename must be changed
|
# - desktop icon filename must be changed
|
||||||
# - desktop filename must be changed
|
# - desktop filename must be changed
|
||||||
# - icon definition filename in desktop file must be changed
|
# - icon definition filename in desktop file must be changed
|
||||||
TARGET = SailTime
|
TARGET = harbour-sailtime
|
||||||
|
|
||||||
CONFIG += sailfishapp
|
CONFIG += sailfishapp
|
||||||
|
|
||||||
SOURCES += src/SailTime.cpp \
|
SOURCES += src/SailTime.cpp \
|
||||||
src/uptimechecker.cpp
|
src/uptimechecker.cpp
|
||||||
|
|
||||||
OTHER_FILES += qml/SailTime.qml \
|
OTHER_FILES += \
|
||||||
qml/cover/CoverPage.qml \
|
qml/cover/CoverPage.qml \
|
||||||
qml/pages/FirstPage.qml \
|
qml/pages/FirstPage.qml \
|
||||||
qml/pages/SecondPage.qml \
|
qml/pages/SecondPage.qml \
|
||||||
rpm/SailTime.spec \
|
rpm/SailTime.spec \
|
||||||
rpm/SailTime.yaml \
|
rpm/SailTime.yaml \
|
||||||
SailTime.desktop \
|
|
||||||
qml/js/storage.js \
|
qml/js/storage.js \
|
||||||
qml/js/uptime.js
|
qml/js/uptime.js \
|
||||||
|
harbour-sailtime.desktop \
|
||||||
|
qml/harbour-sailtime.qml
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
src/uptimechecker.h
|
src/uptimechecker.h
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
Type=Application
|
Type=Application
|
||||||
X-Nemo-Application-Type=silica-qt5
|
X-Nemo-Application-Type=silica-qt5
|
||||||
Name=SailTime
|
Name=SailTime
|
||||||
Icon=/usr/share/icons/hicolor/90x90/apps/SailTime.png
|
Icon=harbour-sailtime
|
||||||
Exec=SailTime
|
Exec=harbour-sailtime
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import QtQuick 2.0
|
import QtQuick 2.0
|
||||||
import Sailfish.Silica 1.0
|
import Sailfish.Silica 1.0
|
||||||
import net.nytsoi.sailfish.sailtime.components 1.0
|
import harbour.sailtime.UptimeChecker 1.0
|
||||||
import "cover"
|
import "cover"
|
||||||
import "pages"
|
import "pages"
|
||||||
|
|
|
@ -20,10 +20,10 @@ License: LICENSE
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Source100: SailTime.yaml
|
Source100: SailTime.yaml
|
||||||
Requires: sailfishsilica-qt5
|
Requires: sailfishsilica-qt5
|
||||||
BuildRequires: pkgconfig(sailfishapp)
|
|
||||||
BuildRequires: pkgconfig(Qt5Quick)
|
|
||||||
BuildRequires: pkgconfig(Qt5Qml)
|
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
|
BuildRequires: pkgconfig(Qt5Qml)
|
||||||
|
BuildRequires: pkgconfig(Qt5Quick)
|
||||||
|
BuildRequires: pkgconfig(sailfishapp)
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -62,13 +62,14 @@ desktop-file-install --delete-original \
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_bindir}
|
/usr/share/harbour-sailtime
|
||||||
%{_datadir}/%{name}/qml
|
|
||||||
%{_datadir}/applications/%{name}.desktop
|
|
||||||
%{_datadir}/icons/hicolor/90x90/apps/%{name}.png
|
|
||||||
/usr/bin
|
|
||||||
/usr/share/SailTime
|
|
||||||
/usr/share/applications
|
|
||||||
/usr/share/icons/hicolor/90x90/apps
|
/usr/share/icons/hicolor/90x90/apps
|
||||||
|
/usr/share/applications
|
||||||
|
/usr/share/SailTime
|
||||||
|
/usr/bin
|
||||||
|
%{_datadir}/icons/hicolor/90x90/apps/%{name}.png
|
||||||
|
%{_datadir}/applications/%{name}.desktop
|
||||||
|
%{_datadir}/%{name}/qml
|
||||||
|
%{_bindir}
|
||||||
# >> files
|
# >> files
|
||||||
# << files
|
# << files
|
||||||
|
|
|
@ -11,19 +11,20 @@ Description: |
|
||||||
Configure: none
|
Configure: none
|
||||||
Builder: qtc5
|
Builder: qtc5
|
||||||
PkgConfigBR:
|
PkgConfigBR:
|
||||||
- sailfishapp
|
|
||||||
- Qt5Quick
|
|
||||||
- Qt5Qml
|
|
||||||
- Qt5Core
|
- Qt5Core
|
||||||
|
- Qt5Qml
|
||||||
|
- Qt5Quick
|
||||||
|
- sailfishapp
|
||||||
Requires:
|
Requires:
|
||||||
- sailfishsilica-qt5
|
- sailfishsilica-qt5
|
||||||
Files:
|
Files:
|
||||||
- '%{_bindir}'
|
- /usr/share/harbour-sailtime
|
||||||
- '%{_datadir}/%{name}/qml'
|
|
||||||
- '%{_datadir}/applications/%{name}.desktop'
|
|
||||||
- '%{_datadir}/icons/hicolor/90x90/apps/%{name}.png'
|
|
||||||
- /usr/bin
|
|
||||||
- /usr/share/SailTime
|
|
||||||
- /usr/share/applications
|
|
||||||
- /usr/share/icons/hicolor/90x90/apps
|
- /usr/share/icons/hicolor/90x90/apps
|
||||||
|
- /usr/share/applications
|
||||||
|
- /usr/share/SailTime
|
||||||
|
- /usr/bin
|
||||||
|
- '%{_datadir}/icons/hicolor/90x90/apps/%{name}.png'
|
||||||
|
- '%{_datadir}/applications/%{name}.desktop'
|
||||||
|
- '%{_datadir}/%{name}/qml'
|
||||||
|
- '%{_bindir}'
|
||||||
PkgBR: []
|
PkgBR: []
|
||||||
|
|
|
@ -48,7 +48,7 @@ int main(int argc, char *argv[])
|
||||||
//
|
//
|
||||||
// To display the view, call "show()" (will show fullscreen on device).
|
// To display the view, call "show()" (will show fullscreen on device).
|
||||||
|
|
||||||
qmlRegisterType<UptimeChecker>("net.nytsoi.sailfish.sailtime.components", 1, 0, "UptimeChecker");
|
qmlRegisterType<UptimeChecker>("harbour.sailtime.UptimeChecker", 1, 0, "UptimeChecker");
|
||||||
return SailfishApp::main(argc, argv);
|
return SailfishApp::main(argc, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue