From e4ea1df9022baa8ea2517f5f9426d00a367675ff Mon Sep 17 00:00:00 2001 From: dorian Date: Thu, 21 Jun 2018 08:52:00 +0200 Subject: [PATCH] Sorted everything --- fannyapp.pro | 12 +- fannyapp.pro.user | 8 +- serverconn.h => headers/serverconn.h | 0 HomeForm.qml => qml/HomeForm.qml | 0 LoginPage.qml => qml/LoginPage.qml | 0 MainPage.qml => qml/MainPage.qml | 0 Page1Form.qml => qml/Page1Form.qml | 0 Page2Form.qml => qml/Page2Form.qml | 0 main.qml => qml/main.qml | 0 qml.qrc => qml/qml.qrc | 0 .../qtquickcontrols2.conf | 0 main.cpp => source/main.cpp | 0 serverconn.cpp => source/serverconn.cpp | 0 untitled.pro.user | 970 ------------------ 14 files changed, 11 insertions(+), 979 deletions(-) rename serverconn.h => headers/serverconn.h (100%) rename HomeForm.qml => qml/HomeForm.qml (100%) rename LoginPage.qml => qml/LoginPage.qml (100%) rename MainPage.qml => qml/MainPage.qml (100%) rename Page1Form.qml => qml/Page1Form.qml (100%) rename Page2Form.qml => qml/Page2Form.qml (100%) rename main.qml => qml/main.qml (100%) rename qml.qrc => qml/qml.qrc (100%) rename qtquickcontrols2.conf => qml/qtquickcontrols2.conf (100%) rename main.cpp => source/main.cpp (100%) rename serverconn.cpp => source/serverconn.cpp (100%) delete mode 100644 untitled.pro.user diff --git a/fannyapp.pro b/fannyapp.pro index 7682788..380d6d5 100644 --- a/fannyapp.pro +++ b/fannyapp.pro @@ -13,10 +13,13 @@ DEFINES += QT_DEPRECATED_WARNINGS #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 SOURCES += \ - main.cpp \ - serverconn.cpp + source/serverconn.cpp \ + source/main.cpp -RESOURCES += qml.qrc +HEADERS += \ + headers/serverconn.h + +RESOURCES += \ # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -29,5 +32,4 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -HEADERS += \ - serverconn.h + diff --git a/fannyapp.pro.user b/fannyapp.pro.user index 3cdc92a..38cbb0a 100644 --- a/fannyapp.pro.user +++ b/fannyapp.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -303,8 +303,8 @@ 2 fannyapp - - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/Fanny App/App/fannyapp.pro + fannyapp2 + Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/gitlab/fanny-app/fannyapp.pro true fannyapp.pro @@ -626,7 +626,7 @@ fannyapp fannyapp Qt4ProjectManager.AndroidRunConfiguration:/home/dorian/Documents/Fanny App/App/fannyapp.pro - fannyapp.pro + ../../Fanny App/App/fannyapp.pro 3768 false true diff --git a/serverconn.h b/headers/serverconn.h similarity index 100% rename from serverconn.h rename to headers/serverconn.h diff --git a/HomeForm.qml b/qml/HomeForm.qml similarity index 100% rename from HomeForm.qml rename to qml/HomeForm.qml diff --git a/LoginPage.qml b/qml/LoginPage.qml similarity index 100% rename from LoginPage.qml rename to qml/LoginPage.qml diff --git a/MainPage.qml b/qml/MainPage.qml similarity index 100% rename from MainPage.qml rename to qml/MainPage.qml diff --git a/Page1Form.qml b/qml/Page1Form.qml similarity index 100% rename from Page1Form.qml rename to qml/Page1Form.qml diff --git a/Page2Form.qml b/qml/Page2Form.qml similarity index 100% rename from Page2Form.qml rename to qml/Page2Form.qml diff --git a/main.qml b/qml/main.qml similarity index 100% rename from main.qml rename to qml/main.qml diff --git a/qml.qrc b/qml/qml.qrc similarity index 100% rename from qml.qrc rename to qml/qml.qrc diff --git a/qtquickcontrols2.conf b/qml/qtquickcontrols2.conf similarity index 100% rename from qtquickcontrols2.conf rename to qml/qtquickcontrols2.conf diff --git a/main.cpp b/source/main.cpp similarity index 100% rename from main.cpp rename to source/main.cpp diff --git a/serverconn.cpp b/source/serverconn.cpp similarity index 100% rename from serverconn.cpp rename to source/serverconn.cpp diff --git a/untitled.pro.user b/untitled.pro.user deleted file mode 100644 index 625a94f..0000000 --- a/untitled.pro.user +++ /dev/null @@ -1,970 +0,0 @@ - - - - - - EnvironmentId - {21eb7c7e-fe37-4955-bdba-642d7341ba98} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - 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.10.1 GCC 64bit - Desktop Qt 5.10.1 GCC 64bit - qt.qt5.5101.gcc_64_kit - 0 - 0 - 0 - - /home/dorian/Documents/Fanny App/App/build-untitled-Desktop_Qt_5_10_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/Fanny App/App/build-untitled-Desktop_Qt_5_10_1_GCC_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - 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 - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/dorian/Documents/Fanny App/App/build-untitled-Desktop_Qt_5_10_1_GCC_64bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - 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 - - 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 - - untitled - - Qt4ProjectManager.Qt4RunConfiguration:/home/dorian/Documents/Fanny App/App/untitled/untitled.pro - true - - untitled.pro - false - - /home/dorian/Documents/Fanny App/App/build-untitled-Desktop_Qt_5_10_1_GCC_64bit-Debug - 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/Fanny App/App/build-untitled-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/Fanny App/App/build-untitled-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 - - 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/App/build-untitled-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 - - - 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 - - -1 - - - - - - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.2 - - Android for x86 (GCC 4.9, Qt 5.10.1 for Android x86) - Android for x86 (GCC 4.9, Qt 5.10.1 for Android x86) - {2bdd6594-4d88-4cbf-9953-cc5e07a0e878} - 0 - 0 - 0 - - /home/dorian/Documents/Fanny App/App/build-untitled-Android_for_x86_GCC_4_9_Qt_5_10_1_for_Android_x86-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/Fanny App/App/build-untitled-Android_for_x86_GCC_4_9_Qt_5_10_1_for_Android_x86-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - 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 - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/dorian/Documents/Fanny App/App/build-untitled-Android_for_x86_GCC_4_9_Qt_5_10_1_for_Android_x86-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 - - - 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 - - -1 - - - - - - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 3 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - -