From ef525a5ffb1e5f2a3f8760f7a559086482021ce4 Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Thu, 1 Aug 2019 21:14:57 +0200 Subject: [PATCH] adjust project file; use controls 2 in main.qml --- LenaPi/LenaPi.pro.user | 364 +++-------------------------------------- LenaPi/main.qml | 2 +- 2 files changed, 28 insertions(+), 338 deletions(-) diff --git a/LenaPi/LenaPi.pro.user b/LenaPi/LenaPi.pro.user index 3f9089e..21cf67f 100644 --- a/LenaPi/LenaPi.pro.user +++ b/LenaPi/LenaPi.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -54,7 +54,10 @@ ProjectExplorer.Project.PluginSettings - + + + true + ProjectExplorer.Project.Target.0 @@ -66,7 +69,7 @@ 0 0 - /home/ar/source/LenaPi/build-LenaPi-Desktop-Debug + /home/araemer/source/LenaPi/build-LenaPi-Desktop-Debug true @@ -84,13 +87,11 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false + false 2 Build @@ -103,13 +104,11 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean + false 1 Clean @@ -144,13 +143,11 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false + false 2 Build @@ -163,13 +160,11 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean + false 1 Clean @@ -204,13 +199,11 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false + false 2 Build @@ -223,13 +216,11 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean + false 1 Clean @@ -304,333 +295,32 @@ LenaPi - Qt4ProjectManager.Qt4RunConfiguration:/home/ar/source/LenaPi/LenaPi/LenaPi.pro - true - + Qt4ProjectManager.Qt4RunConfiguration:/home/araemer/source/LenaPi/LenaPi/LenaPi.pro LenaPi.pro - false - - - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - RasPi - RasPi - {e5a30b8d-6471-4036-a090-63cf64f951ac} - 0 - 0 - 0 - - /home/ar/source/LenaPi/build-LenaPi-RasPi-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 - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/ar/source/LenaPi/build-LenaPi-RasPi-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 - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/ar/source/LenaPi/build-LenaPi-RasPi-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 - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - - true - Check for free disk space - - RemoteLinux.CheckForFreeDiskSpaceStep - - - - - - / - 5242880 - - - true - Upload files via SFTP - - RemoteLinux.DirectUploadStep - - /home/ar/source/LenaPi/build-LenaPi-RasPi-Debug/LenaPi - - - 10.0.1.187 - - - /opt/LenaPi/bin - - - /opt/qt5pi/sysroot - - - 2018-12-24T10:43:47 - - false - true - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy to Remote Linux Host - - DeployToGenericLinux - - 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 - - LenaPi (on Remote Device) - - RemoteLinuxRunConfiguration:LenaPi - - LenaPi - - false - + 3768 false true + true false false true + + /home/araemer/source/LenaPi/build-LenaPi-Desktop-Debug 1 ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion - 18 + 20 Version - 18 + 20 diff --git a/LenaPi/main.qml b/LenaPi/main.qml index 7af174a..8fe9307 100644 --- a/LenaPi/main.qml +++ b/LenaPi/main.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 import QtQuick.Window 2.2 -import QtQuick.Controls 1.4 +import QtQuick.Controls 2.4 Window { visible: true