From 192e315f9ff11a1d3d5121bf169b1b94c7c9e880 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 26 Dec 2018 15:09:34 +0100 Subject: [PATCH 1/2] add qtcreator's .pro.user.* to gitignore --- .gitignore | 2 +- advancedSettings.pro.user.e9f45e7 | 318 ------------------------------ 2 files changed, 1 insertion(+), 319 deletions(-) delete mode 100644 advancedSettings.pro.user.e9f45e7 diff --git a/.gitignore b/.gitignore index 27860a8..92354b8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ Makefile* *.vs *.stash *.appxmanifest -*.user +*.user* diff --git a/advancedSettings.pro.user.e9f45e7 b/advancedSettings.pro.user.e9f45e7 deleted file mode 100644 index ab2fa5e..0000000 --- a/advancedSettings.pro.user.e9f45e7 +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - EnvironmentId - {e9f45e75-3f05-4ad6-a0dc-8a090aa48e0b} - - - 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 MSVC2017 64bit - Desktop Qt 5.10.1 MSVC2017 64bit - qt.qt5.5101.win64_msvc2017_64_kit - 0 - 0 - 0 - - C:/Users/robin/Documents/build-advancedSettings-Desktop_Qt_5_10_1_MSVC2017_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - C:/Users/robin/Documents/build-advancedSettings-Desktop_Qt_5_10_1_MSVC2017_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - C:/Users/robin/Documents/build-advancedSettings-Desktop_Qt_5_10_1_MSVC2017_64bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - 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 - - advancedSettings - advancedSettings2 - Qt4ProjectManager.Qt4RunConfiguration://192.168.1.165/win10/OpenVR-AdvancedSettings/advancedSettings.pro - true - - advancedSettings.pro - false - - C:/Users/robin/Documents/build-advancedSettings-Desktop_Qt_5_10_1_MSVC2017_64bit-Debug/bin/win64/AdvancedSettings - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - From c57b9bc62d0ab9d46dd4938e5eca77b6687a994d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 26 Dec 2018 15:26:59 +0100 Subject: [PATCH 2/2] specify dependency on qt >5.6 --- advancedSettings.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/advancedSettings.pro b/advancedSettings.pro index d54a379..03159dc 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -4,10 +4,11 @@ # #------------------------------------------------- -QT += core gui qml quick multimedia +QT += core gui qml quick multimedia widgets CONFIG += c++11 -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5.6 or higher") +lessThan(QT_MINOR_VERSION, 6): error("requires Qt 5.6 or higher") TARGET = AdvancedSettings TEMPLATE = app