diff --git a/.DS_Store b/.DS_Store index 3418d36..fa33ef6 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/fannyapp.pro.user b/fannyapp.pro.user index 7c47319..001f740 100644 --- a/fannyapp.pro.user +++ b/fannyapp.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {21eb7c7e-fe37-4955-bdba-642d7341ba98} + {736334c7-59b9-42fb-bb64-0bbe827a8b2c} ProjectExplorer.Project.ActiveTarget @@ -59,14 +59,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.10.1 GCC 64bit - Desktop Qt 5.10.1 GCC 64bit - qt.qt5.5101.gcc_64_kit - 0 + Desktop Qt 5.10.1 clang 64bit + Desktop Qt 5.10.1 clang 64bit + qt.qt5.5101.clang_64_kit + 1 0 0 - /home/dorian/Documents/builds/Qt/fanny-app + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Debug true @@ -93,7 +93,7 @@ 2 - Build + Erstellen ProjectExplorer.BuildSteps.Build @@ -112,7 +112,7 @@ 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -126,7 +126,7 @@ true - /home/dorian/Documents/Fanny App/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit-Release + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Release true @@ -153,7 +153,7 @@ 2 - Build + Erstellen ProjectExplorer.BuildSteps.Build @@ -172,7 +172,7 @@ 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -186,7 +186,7 @@ true - /home/dorian/Documents/Fanny App/build-fannyapp-Desktop_Qt_5_10_1_GCC_64bit-Profile + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Profile true @@ -213,7 +213,7 @@ 2 - Build + Erstellen ProjectExplorer.BuildSteps.Build @@ -232,7 +232,7 @@ 1 - Clean + Bereinigen ProjectExplorer.BuildSteps.Clean @@ -249,12 +249,12 @@ 0 - Deploy + Deployment ProjectExplorer.BuildSteps.Deploy 1 - Deploy Configuration + Deployment-Konfiguration ProjectExplorer.DefaultDeployConfiguration @@ -303,333 +303,14 @@ 2 fannyapp - fannyapp2 - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro + + Qt4ProjectManager.Qt4RunConfiguration:/Users/dorian/Documents/git/fanny-app/fannyapp.pro true fannyapp.pro false - /home/dorian/Documents/builds/Qt/fanny-app - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) - Android for armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) - {c2d2fa4a-1656-4ab9-a542-92c96158a688} - 0 - 0 - 0 - - /home/dorian/Documents/builds/Qt/fanny-app/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - 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 - - 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_armv7-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/Fanny App/build-fannyapp-Android_for_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-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 + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Release/fannyapp.app/Contents/MacOS 3768 false true @@ -642,7 +323,7 @@ ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/release/.DS_Store b/release/.DS_Store index c73f150..d4242c6 100644 Binary files a/release/.DS_Store and b/release/.DS_Store differ diff --git a/release/mac OS/fannyapp.app.zip b/release/mac OS/fannyapp.app.zip deleted file mode 100644 index 00bb852..0000000 Binary files a/release/mac OS/fannyapp.app.zip and /dev/null differ diff --git a/release/mac OS/fannyapp.dmg b/release/mac OS/fannyapp.dmg new file mode 100644 index 0000000..9b299bb Binary files /dev/null and b/release/mac OS/fannyapp.dmg differ