From ac43f98bcf006e1754a8f76e8f863c3d7156629e Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Mon, 13 Aug 2018 11:00:10 +0200 Subject: [PATCH] nothing changed --- speedclimbing_stopwatch.pro | 14 +- speedclimbing_stopwatch.pro.user.21eb7c7 | 655 ----------------------- 2 files changed, 7 insertions(+), 662 deletions(-) delete mode 100644 speedclimbing_stopwatch.pro.user.21eb7c7 diff --git a/speedclimbing_stopwatch.pro b/speedclimbing_stopwatch.pro index 922a6b9..47ba79a 100644 --- a/speedclimbing_stopwatch.pro +++ b/speedclimbing_stopwatch.pro @@ -26,9 +26,15 @@ SOURCES += \ sources/buzzerconn.cpp \ sources/appsettings.cpp +HEADERS += \ + headers/sqlstoragemodel.h \ + headers/sqlprofilemodel.h \ + headers/buzzerconn.h \ + headers/appsettings.h + RESOURCES += \ shared.qrc \ - qml/qml.qrc + qml/qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -52,9 +58,3 @@ DISTFILES += \ android { ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources } - -HEADERS += \ - headers/sqlstoragemodel.h \ - headers/sqlprofilemodel.h \ - headers/buzzerconn.h \ - headers/appsettings.h diff --git a/speedclimbing_stopwatch.pro.user.21eb7c7 b/speedclimbing_stopwatch.pro.user.21eb7c7 deleted file mode 100644 index a5439a1..0000000 --- a/speedclimbing_stopwatch.pro.user.21eb7c7 +++ /dev/null @@ -1,655 +0,0 @@ - - - - - - EnvironmentId - {21eb7c7e-fe37-4955-bdba-642d7341ba98} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.11.1 GCC 64bit - Desktop Qt 5.11.1 GCC 64bit - qt.qt5.5111.gcc_64_kit - 0 - 0 - 0 - - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - 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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - 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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Desktop_Qt_5_11_1_GCC_64bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - 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 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 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 - - 2 - - speedclimbing_stopwatch - - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/speedclimbing_stopwatch.pro - true - - speedclimbing_stopwatch.pro - false - - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Android for armeabi-v7a (GCC 4.9, Qt 5.11.1 for Android armv7) - Android for armeabi-v7a (GCC 4.9, Qt 5.11.1 for Android armv7) - {90080436-d11a-44c6-8604-3a0027d99b29} - 1 - 0 - 0 - - /home/dorian/Documents/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Copy application data - - Qt4ProjectManager.AndroidPackageInstallationStep - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - android-27 - /home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/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/climbing_normspeed_stopwatch/build-climbing_normspeed_stopwatch-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_for_Android_armv7-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - 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 - - - - - speedclimbing_stopwatch - speedclimbing_stopwatch - Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/climbing_normspeed_stopwatch/climbing_normspeed_stopwatch/speedclimbing_stopwatch.pro - speedclimbing_stopwatch.pro - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - -