diff --git a/fannyapp.pro b/fannyapp.pro index 5468830..3740478 100644 --- a/fannyapp.pro +++ b/fannyapp.pro @@ -1,4 +1,4 @@ -QT += qml quick quickcontrols2 xml +QT += qml quick quickcontrols2 xml widgets CONFIG += c++11 # The following define makes your compiler emit warnings if you use diff --git a/fannyapp.pro.user b/fannyapp.pro.user index bf6eae0..58eb5cf 100644 --- a/fannyapp.pro.user +++ b/fannyapp.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {21eb7c7e-fe37-4955-bdba-642d7341ba98} + {a7af30b9-cb0f-45fd-9894-328c8b8b2887} ProjectExplorer.Project.ActiveTarget @@ -59,14 +59,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.10.1 GCC 64bit2 - Desktop Qt 5.10.1 GCC 64bit2 - qt.qt5.5101.gcc_64_kit + Android für armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) + Android für armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) + {944fd98d-a247-470d-994b-ce639c60daa2} 1 0 0 - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit2-Debug + D:/Documents/Git/build-fannyapp-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Debug true @@ -92,8 +92,24 @@ - 2 - Build + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen ProjectExplorer.BuildSteps.Build @@ -112,7 +128,7 @@ 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -126,7 +142,7 @@ true - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit2-Release + D:/Documents/Git/build-fannyapp-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Release true @@ -152,8 +168,24 @@ - 2 - Build + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen ProjectExplorer.BuildSteps.Build @@ -172,7 +204,7 @@ 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -186,7 +218,7 @@ true - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit2-Profile + D:/Documents/Git/build-fannyapp-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Profile true @@ -212,8 +244,24 @@ - 2 - Build + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen ProjectExplorer.BuildSteps.Build @@ -232,7 +280,257 @@ 1 - Clean + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + fannyapp + fannyapp + Qt4ProjectManager.AndroidRunConfiguration:D:/Documents/Git/fanny-app/fannyapp.pro + fannyapp.pro + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.10.1 MinGW 32bit + Desktop Qt 5.10.1 MinGW 32bit + qt.qt5.5101.win32_mingw53_kit + 1 + 0 + 0 + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MinGW_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MinGW_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MinGW_32bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -249,12 +547,12 @@ 0 - Deploy + Deployment ProjectExplorer.BuildSteps.Deploy 1 - Deploy Configuration + Deployment-Konfiguration ProjectExplorer.DefaultDeployConfiguration @@ -302,334 +600,12 @@ 2 - fannyapp + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MinGW_32bit-Release/release/fannyapp.exe + + D:\Documents\Git\build-fannyapp-Desktop_Qt_5_10_1_MinGW_32bit-Release\release\fannyapp.exe ausführen - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro - true - - fannyapp.pro - false - - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv72-Release - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv72) - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv72) - {0560b570-8c4b-4d85-a4a2-e3653c24ac2c} - 1 - 0 - 0 - - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv72-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-27 - /home/dorian/Documents/gitlab/fanny-app/android_release.keystore - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv72-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-27 - /home/dorian/Documents/gitlab/fanny-app/android_release.keystore - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv72-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - android-27 - - true - Build Android APK - - QmakeProjectManager.AndroidBuildApkStep - false - false - - 4 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Deploy to Android device - - Qt4ProjectManager.AndroidDeployQtStep - false - - 1 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Android device - - Qt4ProjectManager.AndroidDeployConfiguration2 - - 1 - - MWS0216A15001488 - 24 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - - - fannyapp - fannyapp - Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro - fannyapp.pro + ProjectExplorer.CustomExecutableRunConfiguration 3768 false true diff --git a/favicon.ico b/favicon.ico index 7ec6f31..ae30f13 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/release/windows/fannyapp-setup.exe b/release/windows/fannyapp-setup.exe new file mode 100644 index 0000000..a5d8f92 Binary files /dev/null and b/release/windows/fannyapp-setup.exe differ diff --git a/source/main.cpp b/source/main.cpp index 370c017..8e575a5 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,3 +1,5 @@ +#include + #include #include #include @@ -25,7 +27,6 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QQuickStyle::setStyle("Material"); - QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); if (engine.rootObjects().isEmpty())