diff --git a/FSW-qt/Makefile b/FSW-qt/Makefile --- a/FSW-qt/Makefile +++ b/FSW-qt/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bin/fsw -# Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Nov 15 07:55:16 2013 +# Generated by qmake (2.01a) (Qt 4.8.5) on: Fri Nov 15 17:03:31 2013 # Project: fsw-qt.pro # Template: app # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile fsw-qt.pro diff --git a/FSW-qt/fsw-qt.pro.user b/FSW-qt/fsw-qt.pro.user --- a/FSW-qt/fsw-qt.pro.user +++ b/FSW-qt/fsw-qt.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -25,7 +25,7 @@ 2 - System + UTF-8 false 4 false @@ -51,9 +51,9 @@ ProjectExplorer.Project.Target.0 - Desktop-Qt 4.8.3 in PATH (System) - Desktop-Qt 4.8.3 in PATH (System) - {be73cf6a-f9d8-4d5a-8adf-adc2d83e2e44} + Desktop-Qt 4.8.2 in PATH (System) + Desktop-Qt 4.8.2 in PATH (System) + {5289e843-9ef2-45ce-88c6-ad27d8e08def} 0 0 0 @@ -113,10 +113,69 @@ Qt4ProjectManager.Qt4BuildConfiguration 0 - /home/admin/opt/DEV_PLE/FSW-qt + /opt/DEV_PLE/FSW-qt false - 1 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + + Release2 + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /opt/DEV_PLE/FSW-qt + false + + 2 0 @@ -167,7 +226,7 @@ fsw-qt - Qt4ProjectManager.Qt4RunConfiguration:/home/admin/opt/DEV_PLE/FSW-qt/fsw-qt.pro + Qt4ProjectManager.Qt4RunConfiguration:/opt/DEV_PLE/FSW-qt/fsw-qt.pro fsw-qt.pro false @@ -184,12 +243,194 @@ + ProjectExplorer.Project.Target.1 + + Desktop2 + Desktop2 + {e96c4de1-323d-4095-8746-d006ca3bd573} + 0 + 0 + 0 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + /opt/DEV_PLE/FSW-qt + false + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + + Release2 + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /opt/DEV_PLE/FSW-qt + false + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + -1 + + fsw-qt + + Qt4ProjectManager.Qt4RunConfiguration:/opt/DEV_PLE/FSW-qt/fsw-qt.pro + + fsw-qt.pro + false + true + + 3768 + false + true + false + false + true + + 1 + + + ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.EnvironmentId - {cdbf9cdc-1e84-406e-889b-c4feef49e75c} + {2e58a81f-9962-4bba-ae6b-760177f0656c} ProjectExplorer.Project.Updater.FileVersion