From 0971777d6c7ff60520a4a327260a7f3d9fc8fa18 Mon Sep 17 00:00:00 2001 From: Mikko Ahlroth Date: Fri, 13 Dec 2013 23:01:03 +0200 Subject: [PATCH] Recreate app with updated project template, now deploys on phone --- SailTime.png | Bin 3177 -> 0 bytes harbour-sailtime.desktop | 2 +- harbour-sailtime.png | Bin 0 -> 2965 bytes SailTime.pro => harbour-sailtime.pro | 17 +++--- rpm/SailTime.spec | 75 --------------------------- rpm/SailTime.yaml | 30 ----------- rpm/harbour-sailtime.yaml | 30 +++++++++++ src/SailTime.cpp | 54 ------------------- src/harbour-sailtime.cpp | 28 ++++++++++ 9 files changed, 66 insertions(+), 170 deletions(-) delete mode 100644 SailTime.png create mode 100644 harbour-sailtime.png rename SailTime.pro => harbour-sailtime.pro (73%) delete mode 100644 rpm/SailTime.spec delete mode 100644 rpm/SailTime.yaml create mode 100644 rpm/harbour-sailtime.yaml delete mode 100644 src/SailTime.cpp create mode 100644 src/harbour-sailtime.cpp diff --git a/SailTime.png b/SailTime.png deleted file mode 100644 index 4b15e07474bf10ba4bfb7cccfdc2f4e43d28e20f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3177 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 P00000NkvXXu0mjfX)_vx diff --git a/harbour-sailtime.desktop b/harbour-sailtime.desktop index 3ff1a9d..6ac1cad 100644 --- a/harbour-sailtime.desktop +++ b/harbour-sailtime.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application X-Nemo-Application-Type=silica-qt5 -Name=SailTime +Name=harbour-sailtime Icon=harbour-sailtime Exec=harbour-sailtime diff --git a/harbour-sailtime.png b/harbour-sailtime.png new file mode 100644 index 0000000000000000000000000000000000000000..4c883a0ec7f3c6c6c18fa9e376d98d9d2520c161 GIT binary patch literal 2965 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 LNkvXXu0mjfbPB7e literal 0 HcmV?d00001 diff --git a/SailTime.pro b/harbour-sailtime.pro similarity index 73% rename from SailTime.pro rename to harbour-sailtime.pro index 03ad025..e608c04 100644 --- a/SailTime.pro +++ b/harbour-sailtime.pro @@ -10,20 +10,17 @@ TARGET = harbour-sailtime CONFIG += sailfishapp -SOURCES += src/SailTime.cpp \ +HEADERS += src/uptimechecker.h + +SOURCES += src/harbour-sailtime.cpp \ src/uptimechecker.cpp -OTHER_FILES += \ +OTHER_FILES += qml/harbour-sailtime.qml \ qml/cover/CoverPage.qml \ qml/pages/FirstPage.qml \ qml/pages/SecondPage.qml \ - rpm/SailTime.spec \ - rpm/SailTime.yaml \ qml/js/storage.js \ - qml/js/uptime.js \ - harbour-sailtime.desktop \ - qml/harbour-sailtime.qml - -HEADERS += \ - src/uptimechecker.h + rpm/harbour-sailtime.spec \ + rpm/harbour-sailtime.yaml \ + harbour-sailtime.desktop diff --git a/rpm/SailTime.spec b/rpm/SailTime.spec deleted file mode 100644 index b1adc98..0000000 --- a/rpm/SailTime.spec +++ /dev/null @@ -1,75 +0,0 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.27 -# - -Name: SailTime - -# >> macros -# << macros - -%{!?qtc_qmake:%define qtc_qmake %qmake} -%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} -%{!?qtc_make:%define qtc_make make} -%{?qtc_builddir:%define _builddir %qtc_builddir} -Summary: SailTime -Version: 1.0 -Release: 1 -Group: Qt/Qt -License: LICENSE -Source0: %{name}-%{version}.tar.bz2 -Source100: SailTime.yaml -Requires: sailfishsilica-qt5 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(sailfishapp) -BuildRequires: desktop-file-utils - -%description -Short description of my SailfishOS Application - - -%prep -%setup -q -n %{name}-%{version} - -# >> setup -# << setup - -%build -# >> build pre -# << build pre - -%qtc_qmake5 - -%qtc_make %{?_smp_mflags} - -# >> build post -# << build post - -%install -rm -rf %{buildroot} -# >> install pre -# << install pre -%qmake5_install - -# >> install post -# << install post - -desktop-file-install --delete-original \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/*.desktop - -%files -%defattr(-,root,root,-) -/usr/share/harbour-sailtime -/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 diff --git a/rpm/SailTime.yaml b/rpm/SailTime.yaml deleted file mode 100644 index 451c516..0000000 --- a/rpm/SailTime.yaml +++ /dev/null @@ -1,30 +0,0 @@ -Name: SailTime -Summary: SailTime -Version: 1.0 -Release: 1 -Group: Qt/Qt -License: LICENSE -Sources: -- '%{name}-%{version}.tar.bz2' -Description: | - Short description of my SailfishOS Application -Configure: none -Builder: qtc5 -PkgConfigBR: -- Qt5Core -- Qt5Qml -- Qt5Quick -- sailfishapp -Requires: -- sailfishsilica-qt5 -Files: -- /usr/share/harbour-sailtime -- /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: [] diff --git a/rpm/harbour-sailtime.yaml b/rpm/harbour-sailtime.yaml new file mode 100644 index 0000000..777c4fc --- /dev/null +++ b/rpm/harbour-sailtime.yaml @@ -0,0 +1,30 @@ +Name: harbour-sailtime +Summary: SailTime +Version: 0.1 +Release: 1 +Group: Qt/Qt +URL: http://example.org/ +License: +Sources: +- '%{name}-%{version}.tar.bz2' +Description: |- + SailTime shows how long your phone has been sailing the open seas, or in other words, how long it has been switched on. It also displays the load averages for the last 1, 5 and 15 minutes. +Configure: none +Builder: qtc5 +PkgConfigBR: +- sailfishapp >= 0.0.10 +- Qt5Core +- Qt5Qml +- Qt5Quick +Requires: +- sailfishsilica-qt5 >= 0.10.9 +Files: +- /usr/share/icons/hicolor/86x86/apps +- /usr/share/applications +- /usr/share/harbour-sailtime +- /usr/bin +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/%{name}/qml' +- '%{_bindir}' +PkgBR: [] diff --git a/src/SailTime.cpp b/src/SailTime.cpp deleted file mode 100644 index 4f751d0..0000000 --- a/src/SailTime.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright (C) 2013 Jolla Ltd. - Contact: Thomas Perl - All rights reserved. - - You may use this file under the terms of BSD license as follows: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Jolla Ltd nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef QT_QML_DEBUG -#include -#endif - -#include - -#include "uptimechecker.h" - - -int main(int argc, char *argv[]) -{ - // SailfishApp::main() will display "qml/template.qml", if you need more - // control over initialization, you can use: - // - // - SailfishApp::application(int, char *[]) to get the QGuiApplication * - // - SailfishApp::createView() to get a new QQuickView * instance - // - SailfishApp::pathTo(QString) to get a QUrl to a resource file - // - // To display the view, call "show()" (will show fullscreen on device). - - qmlRegisterType("harbour.sailtime.UptimeChecker", 1, 0, "UptimeChecker"); - return SailfishApp::main(argc, argv); -} - diff --git a/src/harbour-sailtime.cpp b/src/harbour-sailtime.cpp new file mode 100644 index 0000000..27df80c --- /dev/null +++ b/src/harbour-sailtime.cpp @@ -0,0 +1,28 @@ +/* + +*/ + +#ifdef QT_QML_DEBUG +#include +#endif + +#include + +#include "uptimechecker.h" + + +int main(int argc, char *argv[]) +{ + // SailfishApp::main() will display "qml/template.qml", if you need more + // control over initialization, you can use: + // + // - SailfishApp::application(int, char *[]) to get the QGuiApplication * + // - SailfishApp::createView() to get a new QQuickView * instance + // - SailfishApp::pathTo(QString) to get a QUrl to a resource file + // + // To display the view, call "show()" (will show fullscreen on device). + + qmlRegisterType("harbour.sailtime.UptimeChecker", 1, 0, "UptimeChecker"); + return SailfishApp::main(argc, argv); +} +