diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0272581 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +groundstation/groundstation.pro.user \ No newline at end of file diff --git a/groundstation/groundstation.pro.user b/groundstation/groundstation.pro.user index a7ba99c..480e2d0 100644 --- a/groundstation/groundstation.pro.user +++ b/groundstation/groundstation.pro.user @@ -1,18 +1,10 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> origin/master -======= - ->>>>>>> a25dd54320bf0423c5638259334c858746e2a415 + EnvironmentId - {db3e1557-086a-4178-9b2c-c4af1acd9f93} + {f0de3c19-7390-432f-8215-71267a77c807} ProjectExplorer.Project.ActiveTarget @@ -66,14 +58,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.3 clang 64bit - Desktop Qt 5.3 clang 64bit - qt.53.clang_64_kit + Desktop Qt 5.3 MSVC2010 OpenGL 32bit + Desktop Qt 5.3 MSVC2010 OpenGL 32bit + qt.53.win32_msvc2010_opengl_kit 0 0 0 - /Users/richardyu/Documents/groundstation/build-groundstation-Desktop_Qt_5_3_clang_64bit-Debug + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug true @@ -90,10 +82,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false @@ -109,10 +98,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean @@ -132,7 +118,7 @@ true - /Users/richardyu/Documents/groundstation/build-groundstation-Desktop_Qt_5_3_clang_64bit-Release + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Release true @@ -149,10 +135,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + false @@ -168,10 +151,7 @@ Make Qt4ProjectManager.MakeStep - - -w - -r - + true clean @@ -244,7 +224,377 @@ groundstation - Qt4ProjectManager.Qt4RunConfiguration:/Users/richardyu/Documents/groundstation/groundstation/groundstation.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro + + groundstation.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.3 MSVC2012 OpenGL 32bit + Desktop Qt 5.3 MSVC2012 OpenGL 32bit + qt.53.win32_msvc2012_opengl_kit + 0 + 0 + 0 + + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2012_OpenGL_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2012_OpenGL_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + 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 + + groundstation + + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro + + groundstation.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.3 MSVC2013 64bit + Desktop Qt 5.3 MSVC2013 64bit + qt.53.win64_msvc2013_64_kit + 0 + 0 + 0 + + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2013_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Jesse/groundstation/build-groundstation-Desktop_Qt_5_3_MSVC2013_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + 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 + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + 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 + + groundstation + + Qt4ProjectManager.Qt4RunConfiguration:C:/Jesse/groundstation/groundstation/groundstation.pro groundstation.pro false @@ -262,7 +612,7 @@ ProjectExplorer.Project.TargetCount - 1 + 3 ProjectExplorer.Project.Updater.FileVersion