Add .user files to gitignore and remove deleted files from CMakeLists.
This commit is contained in:
		
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,9 @@ | ||||
| Thumbs.db | ||||
| .kdev4 | ||||
| MultiMC5.kdev4 | ||||
| MultiMC.pro.user | ||||
| CMakeLists.txt.user | ||||
| .user | ||||
| build | ||||
| resources/CMakeFiles | ||||
| resources/MultiMCLauncher.jar | ||||
|   | ||||
| @@ -127,8 +127,6 @@ data/inifile.h | ||||
| data/instancebase.h | ||||
| data/instancemodel.h | ||||
| data/settingsbase.h | ||||
| data/settingsmacros.h | ||||
| data/settingsmacrosundef.h | ||||
| data/stdinstance.h | ||||
|  | ||||
| util/pathutils.h | ||||
|   | ||||
							
								
								
									
										239
									
								
								MultiMC.pro.user
									
									
									
									
									
								
							
							
						
						
									
										239
									
								
								MultiMC.pro.user
									
									
									
									
									
								
							| @@ -1,239 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <!DOCTYPE QtCreatorProject> | ||||
| <!-- Written by Qt Creator 2.6.1, 2013-01-18T12:12:04. --> | ||||
| <qtcreator> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.ActiveTarget</variable> | ||||
|   <value type="int">0</value> | ||||
|  </data> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.EditorSettings</variable> | ||||
|   <valuemap type="QVariantMap"> | ||||
|    <value type="bool" key="EditorConfiguration.AutoIndent">true</value> | ||||
|    <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | ||||
|    <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | ||||
|    <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | ||||
|     <value type="QString" key="language">Cpp</value> | ||||
|     <valuemap type="QVariantMap" key="value"> | ||||
|      <value type="QString" key="CurrentPreferences">CppGlobal</value> | ||||
|     </valuemap> | ||||
|    </valuemap> | ||||
|    <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | ||||
|     <value type="QString" key="language">QmlJS</value> | ||||
|     <valuemap type="QVariantMap" key="value"> | ||||
|      <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> | ||||
|     </valuemap> | ||||
|    </valuemap> | ||||
|    <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> | ||||
|    <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> | ||||
|    <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | ||||
|    <value type="int" key="EditorConfiguration.IndentSize">4</value> | ||||
|    <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | ||||
|    <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | ||||
|    <value type="int" key="EditorConfiguration.PaddingMode">1</value> | ||||
|    <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | ||||
|    <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value> | ||||
|    <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | ||||
|    <value type="int" key="EditorConfiguration.TabKeyBehavior">1</value> | ||||
|    <value type="int" key="EditorConfiguration.TabSize">8</value> | ||||
|    <value type="bool" key="EditorConfiguration.UseGlobal">true</value> | ||||
|    <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> | ||||
|    <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> | ||||
|    <value type="bool" key="EditorConfiguration.cleanIndentation">false</value> | ||||
|    <value type="bool" key="EditorConfiguration.cleanWhitespace">false</value> | ||||
|    <value type="bool" key="EditorConfiguration.inEntireDocument">true</value> | ||||
|   </valuemap> | ||||
|  </data> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.PluginSettings</variable> | ||||
|   <valuemap type="QVariantMap"/> | ||||
|  </data> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.Target.0</variable> | ||||
|   <valuemap type="QVariantMap"> | ||||
|    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.0.0 MSVC2010 32bit (SDK)</value> | ||||
|    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.0.0 MSVC2010 32bit (SDK)</value> | ||||
|    <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">qt.500.win32_msvc2010.essentials_kit</value> | ||||
|    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> | ||||
|    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||||
|    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||||
|    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | ||||
|     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||||
|      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||||
|       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|       <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||||
|       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||||
|       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||||
|       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||||
|       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||||
|      </valuemap> | ||||
|      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||||
|       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|       <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||||
|       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||||
|      </valuemap> | ||||
|      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|      <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||||
|     </valuemap> | ||||
|     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||||
|      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||||
|       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|       <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||||
|       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||||
|      </valuemap> | ||||
|      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|      <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||||
|     </valuemap> | ||||
|     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||||
|     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||||
|     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|     <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||||
|     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | ||||
|     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/Andrew/Projects/MultiMC5/MultiMC-build-Desktop_Qt_5_0_0_MSVC2010_32bit_SDK-Debug</value> | ||||
|     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||||
|    </valuemap> | ||||
|    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> | ||||
|     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||||
|      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||||
|       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|       <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||||
|       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||||
|       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||||
|       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||||
|       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||||
|      </valuemap> | ||||
|      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||||
|       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|       <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||||
|       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||||
|      </valuemap> | ||||
|      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|      <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||||
|     </valuemap> | ||||
|     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||||
|      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||||
|       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||||
|       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|       <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||||
|       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||||
|       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||||
|      </valuemap> | ||||
|      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|      <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||||
|     </valuemap> | ||||
|     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||||
|     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||||
|     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|     <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||||
|     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | ||||
|     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/Andrew/Projects/MultiMC5/MultiMC-build-Desktop_Qt_5_0_0_MSVC2010_32bit_SDK-Release</value> | ||||
|     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||||
|    </valuemap> | ||||
|    <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> | ||||
|    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||||
|     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||||
|      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||||
|      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|      <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||||
|     </valuemap> | ||||
|     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|     <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||||
|    </valuemap> | ||||
|    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||||
|    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||||
|     <value type="bool" key="Analyzer.Project.UseGlobal">true</value> | ||||
|     <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | ||||
|     <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | ||||
|     <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | ||||
|     <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> | ||||
|     <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> | ||||
|     <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> | ||||
|     <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | ||||
|     <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | ||||
|     <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | ||||
|     <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | ||||
|     <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | ||||
|     <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | ||||
|     <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | ||||
|     <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | ||||
|      <value type="int">0</value> | ||||
|      <value type="int">1</value> | ||||
|      <value type="int">2</value> | ||||
|      <value type="int">3</value> | ||||
|      <value type="int">4</value> | ||||
|      <value type="int">5</value> | ||||
|      <value type="int">6</value> | ||||
|      <value type="int">7</value> | ||||
|      <value type="int">8</value> | ||||
|      <value type="int">9</value> | ||||
|      <value type="int">10</value> | ||||
|      <value type="int">11</value> | ||||
|      <value type="int">12</value> | ||||
|      <value type="int">13</value> | ||||
|      <value type="int">14</value> | ||||
|     </valuelist> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">MultiMC</value> | ||||
|     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||||
|     <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Andrew/Projects/MultiMC5/MultiMC/MultiMC.pro</value> | ||||
|     <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> | ||||
|     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | ||||
|     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">MultiMC.pro</value> | ||||
|     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | ||||
|     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> | ||||
|     <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> | ||||
|     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> | ||||
|     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | ||||
|     <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> | ||||
|     <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | ||||
|     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | ||||
|     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | ||||
|    </valuemap> | ||||
|    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||||
|   </valuemap> | ||||
|  </data> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.TargetCount</variable> | ||||
|   <value type="int">1</value> | ||||
|  </data> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | ||||
|   <value type="QString">{d833f846-3a8b-4e2a-9d77-5f93cddd0a0f}</value> | ||||
|  </data> | ||||
|  <data> | ||||
|   <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | ||||
|   <value type="int">12</value> | ||||
|  </data> | ||||
| </qtcreator> | ||||
		Reference in New Issue
	
	Block a user