Commit 3ca9e801bcead7b02165ac78ccd2e710f02fc90e
1 parent
cc1e1d1e
Migrated to Qt5
Showing
7 changed files
with
346 additions
and
82 deletions
apunts.pro.user
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <!DOCTYPE QtCreatorProject> | 2 | <!DOCTYPE QtCreatorProject> |
3 | -<!-- Written by QtCreator 2.7.0, 2014-01-10T18:31:42. --> | 3 | +<!-- Written by QtCreator 3.1.1, 2015-07-22T22:25:57. --> |
4 | <qtcreator> | 4 | <qtcreator> |
5 | <data> | 5 | <data> |
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
@@ -13,15 +13,15 @@ | @@ -13,15 +13,15 @@ | ||
13 | <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | 13 | <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> |
14 | <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | 14 | <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> |
15 | <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | 15 | <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> |
16 | - <value type="QByteArray" key="language">Cpp</value> | 16 | + <value type="QString" key="language">Cpp</value> |
17 | <valuemap type="QVariantMap" key="value"> | 17 | <valuemap type="QVariantMap" key="value"> |
18 | - <value type="QString" key="CurrentPreferences">CppGlobal</value> | 18 | + <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> |
19 | </valuemap> | 19 | </valuemap> |
20 | </valuemap> | 20 | </valuemap> |
21 | <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | 21 | <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> |
22 | - <value type="QByteArray" key="language">QmlJS</value> | 22 | + <value type="QString" key="language">QmlJS</value> |
23 | <valuemap type="QVariantMap" key="value"> | 23 | <valuemap type="QVariantMap" key="value"> |
24 | - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> | 24 | + <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> |
25 | </valuemap> | 25 | </valuemap> |
26 | </valuemap> | 26 | </valuemap> |
27 | <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> | 27 | <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> |
@@ -29,9 +29,12 @@ | @@ -29,9 +29,12 @@ | ||
29 | <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | 29 | <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> |
30 | <value type="int" key="EditorConfiguration.IndentSize">4</value> | 30 | <value type="int" key="EditorConfiguration.IndentSize">4</value> |
31 | <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | 31 | <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> |
32 | + <value type="int" key="EditorConfiguration.MarginColumn">80</value> | ||
33 | + <value type="bool" key="EditorConfiguration.MouseHiding">true</value> | ||
32 | <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | 34 | <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> |
33 | <value type="int" key="EditorConfiguration.PaddingMode">1</value> | 35 | <value type="int" key="EditorConfiguration.PaddingMode">1</value> |
34 | <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | 36 | <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> |
37 | + <value type="bool" key="EditorConfiguration.ShowMargin">false</value> | ||
35 | <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> | 38 | <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> |
36 | <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | 39 | <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> |
37 | <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> | 40 | <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> |
@@ -53,17 +56,18 @@ | @@ -53,17 +56,18 @@ | ||
53 | <valuemap type="QVariantMap"> | 56 | <valuemap type="QVariantMap"> |
54 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> | 57 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> |
55 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> | 58 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> |
56 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{c86d7da1-3052-4bc0-8e07-2ce69d480c89}</value> | 59 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5a68c84f-7441-4933-99b6-6d46079d1e90}</value> |
57 | <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> | 60 | <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> |
58 | <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | 61 | <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> |
59 | <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | 62 | <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> |
60 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | 63 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> |
64 | + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/imanol/devel/qt4/build-apunts-Desktop-Debug</value> | ||
61 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | 65 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
62 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | 66 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
63 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | 67 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
64 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | 68 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
65 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 69 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
66 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | 70 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
67 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | 71 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
68 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | 72 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
69 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | 73 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
@@ -73,7 +77,7 @@ | @@ -73,7 +77,7 @@ | ||
73 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | 77 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
74 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | 78 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
75 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 79 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
76 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | 80 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
77 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | 81 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
78 | <value type="QString">-w</value> | 82 | <value type="QString">-w</value> |
79 | <value type="QString">-r</value> | 83 | <value type="QString">-r</value> |
@@ -85,14 +89,14 @@ | @@ -85,14 +89,14 @@ | ||
85 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | 89 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
86 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | 90 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
87 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 91 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
88 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | 92 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
89 | </valuemap> | 93 | </valuemap> |
90 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | 94 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
91 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | 95 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
92 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | 96 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
93 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | 97 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
94 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 98 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
95 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | 99 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
96 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | 100 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
97 | <value type="QString">-w</value> | 101 | <value type="QString">-w</value> |
98 | <value type="QString">-r</value> | 102 | <value type="QString">-r</value> |
@@ -104,25 +108,25 @@ | @@ -104,25 +108,25 @@ | ||
104 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | 108 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
105 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | 109 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
106 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 110 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
107 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | 111 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
108 | </valuemap> | 112 | </valuemap> |
109 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | 113 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
110 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | 114 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
111 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | 115 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
112 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> | 116 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> |
113 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 117 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
114 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | 118 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
115 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | 119 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> |
116 | - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/users/imanol/devel/qt4/apunts</value> | ||
117 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | 120 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> |
118 | </valuemap> | 121 | </valuemap> |
119 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> | 122 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> |
123 | + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/imanol/devel/qt4/build-apunts-Desktop-Release</value> | ||
120 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | 124 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> |
121 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | 125 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
122 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | 126 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
123 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | 127 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> |
124 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 128 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
125 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | 129 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> |
126 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | 130 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> |
127 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | 131 | <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> |
128 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | 132 | <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> |
@@ -132,7 +136,7 @@ | @@ -132,7 +136,7 @@ | ||
132 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | 136 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
133 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | 137 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
134 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 138 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
135 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | 139 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
136 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | 140 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
137 | <value type="QString">-w</value> | 141 | <value type="QString">-w</value> |
138 | <value type="QString">-r</value> | 142 | <value type="QString">-r</value> |
@@ -144,14 +148,14 @@ | @@ -144,14 +148,14 @@ | ||
144 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | 148 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> |
145 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | 149 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> |
146 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 150 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
147 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | 151 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> |
148 | </valuemap> | 152 | </valuemap> |
149 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | 153 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> |
150 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | 154 | <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> |
151 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | 155 | <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> |
152 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | 156 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> |
153 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 157 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
154 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | 158 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> |
155 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | 159 | <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> |
156 | <value type="QString">-w</value> | 160 | <value type="QString">-w</value> |
157 | <value type="QString">-r</value> | 161 | <value type="QString">-r</value> |
@@ -163,16 +167,15 @@ | @@ -163,16 +167,15 @@ | ||
163 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | 167 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> |
164 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | 168 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> |
165 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 169 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
166 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | 170 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> |
167 | </valuemap> | 171 | </valuemap> |
168 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | 172 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> |
169 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | 173 | <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> |
170 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | 174 | <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> |
171 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> | 175 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> |
172 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 176 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
173 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | 177 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> |
174 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | 178 | <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> |
175 | - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/users/imanol/devel/qt4/apunts/</value> | ||
176 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | 179 | <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> |
177 | </valuemap> | 180 | </valuemap> |
178 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> | 181 | <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> |
@@ -181,16 +184,16 @@ | @@ -181,16 +184,16 @@ | ||
181 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | 184 | <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> |
182 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | 185 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> |
183 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 186 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
184 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | 187 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> |
185 | </valuemap> | 188 | </valuemap> |
186 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | 189 | <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> |
187 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | 190 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> |
188 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 191 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
189 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | 192 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> |
190 | </valuemap> | 193 | </valuemap> |
191 | <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | 194 | <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> |
195 | + <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> | ||
192 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | 196 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> |
193 | - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> | ||
194 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | 197 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
195 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | 198 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> |
196 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | 199 | <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> |
@@ -200,8 +203,12 @@ | @@ -200,8 +203,12 @@ | ||
200 | <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | 203 | <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> |
201 | <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | 204 | <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> |
202 | <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | 205 | <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> |
206 | + <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value> | ||
203 | <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | 207 | <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> |
204 | <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | 208 | <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> |
209 | + <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value> | ||
210 | + <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value> | ||
211 | + <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value> | ||
205 | <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | 212 | <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> |
206 | <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | 213 | <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> |
207 | <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | 214 | <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> |
@@ -221,18 +228,19 @@ | @@ -221,18 +228,19 @@ | ||
221 | <value type="int">13</value> | 228 | <value type="int">13</value> |
222 | <value type="int">14</value> | 229 | <value type="int">14</value> |
223 | </valuelist> | 230 | </valuelist> |
231 | + <value type="int" key="PE.EnvironmentAspect.Base">2</value> | ||
232 | + <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> | ||
224 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">apunts</value> | 233 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">apunts</value> |
225 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | 234 | <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> |
226 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/users/imanol/devel/qt4/apunts/apunts.pro</value> | ||
227 | - <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> | 235 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/imanol/devel/qt4/apunts/apunts.pro</value> |
228 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | 236 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> |
229 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">apunts.pro</value> | 237 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">apunts.pro</value> |
230 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | 238 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> |
231 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> | 239 | <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> |
232 | - <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> | ||
233 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> | 240 | <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> |
234 | <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | 241 | <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> |
235 | - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> | 242 | + <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> |
243 | + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> | ||
236 | <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | 244 | <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> |
237 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | 245 | <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> |
238 | <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | 246 | <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> |
@@ -246,10 +254,10 @@ | @@ -246,10 +254,10 @@ | ||
246 | </data> | 254 | </data> |
247 | <data> | 255 | <data> |
248 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | 256 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
249 | - <value type="QString">{e69b930c-1ca4-433f-a065-463b1709aab0}</value> | 257 | + <value type="QByteArray">{e0440690-e686-47b2-9f26-610d49a4e9b0}</value> |
250 | </data> | 258 | </data> |
251 | <data> | 259 | <data> |
252 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | 260 | <variable>ProjectExplorer.Project.Updater.FileVersion</variable> |
253 | - <value type="int">12</value> | 261 | + <value type="int">15</value> |
254 | </data> | 262 | </data> |
255 | </qtcreator> | 263 | </qtcreator> |
apunts.pro.user.e69b930.2.7pre1
0 โ 100644
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<!DOCTYPE QtCreatorProject> | ||
3 | +<!-- Written by QtCreator 2.7.0, 2014-01-10T18:31:42. --> | ||
4 | +<qtcreator> | ||
5 | + <data> | ||
6 | + <variable>ProjectExplorer.Project.ActiveTarget</variable> | ||
7 | + <value type="int">0</value> | ||
8 | + </data> | ||
9 | + <data> | ||
10 | + <variable>ProjectExplorer.Project.EditorSettings</variable> | ||
11 | + <valuemap type="QVariantMap"> | ||
12 | + <value type="bool" key="EditorConfiguration.AutoIndent">true</value> | ||
13 | + <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | ||
14 | + <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | ||
15 | + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | ||
16 | + <value type="QByteArray" key="language">Cpp</value> | ||
17 | + <valuemap type="QVariantMap" key="value"> | ||
18 | + <value type="QString" key="CurrentPreferences">CppGlobal</value> | ||
19 | + </valuemap> | ||
20 | + </valuemap> | ||
21 | + <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | ||
22 | + <value type="QByteArray" key="language">QmlJS</value> | ||
23 | + <valuemap type="QVariantMap" key="value"> | ||
24 | + <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> | ||
25 | + </valuemap> | ||
26 | + </valuemap> | ||
27 | + <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> | ||
28 | + <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> | ||
29 | + <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | ||
30 | + <value type="int" key="EditorConfiguration.IndentSize">4</value> | ||
31 | + <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | ||
32 | + <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | ||
33 | + <value type="int" key="EditorConfiguration.PaddingMode">1</value> | ||
34 | + <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | ||
35 | + <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> | ||
36 | + <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | ||
37 | + <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> | ||
38 | + <value type="int" key="EditorConfiguration.TabSize">8</value> | ||
39 | + <value type="bool" key="EditorConfiguration.UseGlobal">true</value> | ||
40 | + <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> | ||
41 | + <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> | ||
42 | + <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> | ||
43 | + <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> | ||
44 | + <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> | ||
45 | + </valuemap> | ||
46 | + </data> | ||
47 | + <data> | ||
48 | + <variable>ProjectExplorer.Project.PluginSettings</variable> | ||
49 | + <valuemap type="QVariantMap"/> | ||
50 | + </data> | ||
51 | + <data> | ||
52 | + <variable>ProjectExplorer.Project.Target.0</variable> | ||
53 | + <valuemap type="QVariantMap"> | ||
54 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value> | ||
55 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value> | ||
56 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{c86d7da1-3052-4bc0-8e07-2ce69d480c89}</value> | ||
57 | + <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> | ||
58 | + <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||
59 | + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||
60 | + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | ||
61 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
62 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
63 | + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
64 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
65 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
66 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
67 | + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
68 | + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
69 | + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
70 | + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
71 | + </valuemap> | ||
72 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
73 | + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
74 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
75 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
76 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
77 | + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
78 | + <value type="QString">-w</value> | ||
79 | + <value type="QString">-r</value> | ||
80 | + </valuelist> | ||
81 | + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
82 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
83 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
84 | + </valuemap> | ||
85 | + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
86 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
87 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
88 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
89 | + </valuemap> | ||
90 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
91 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
92 | + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
93 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
94 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
95 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
96 | + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
97 | + <value type="QString">-w</value> | ||
98 | + <value type="QString">-r</value> | ||
99 | + </valuelist> | ||
100 | + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
101 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
102 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
103 | + </valuemap> | ||
104 | + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
105 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
106 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
107 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
108 | + </valuemap> | ||
109 | + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
110 | + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
111 | + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
112 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> | ||
113 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
114 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
115 | + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | ||
116 | + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/users/imanol/devel/qt4/apunts</value> | ||
117 | + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
118 | + </valuemap> | ||
119 | + <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> | ||
120 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
121 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
122 | + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
123 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
124 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
125 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
126 | + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
127 | + <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
128 | + <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
129 | + <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
130 | + </valuemap> | ||
131 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
132 | + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
133 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
134 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
135 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
136 | + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
137 | + <value type="QString">-w</value> | ||
138 | + <value type="QString">-r</value> | ||
139 | + </valuelist> | ||
140 | + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
141 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
142 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
143 | + </valuemap> | ||
144 | + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
145 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
146 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
147 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
148 | + </valuemap> | ||
149 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
150 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
151 | + <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
152 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
153 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
154 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
155 | + <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
156 | + <value type="QString">-w</value> | ||
157 | + <value type="QString">-r</value> | ||
158 | + </valuelist> | ||
159 | + <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
160 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
161 | + <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
162 | + </valuemap> | ||
163 | + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
164 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
165 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
166 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
167 | + </valuemap> | ||
168 | + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
169 | + <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
170 | + <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
171 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> | ||
172 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
173 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
174 | + <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | ||
175 | + <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/users/imanol/devel/qt4/apunts/</value> | ||
176 | + <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
177 | + </valuemap> | ||
178 | + <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> | ||
179 | + <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||
180 | + <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
181 | + <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||
182 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||
183 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
184 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||
185 | + </valuemap> | ||
186 | + <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||
187 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | ||
188 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
189 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||
190 | + </valuemap> | ||
191 | + <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||
192 | + <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||
193 | + <value type="bool" key="Analyzer.Project.UseGlobal">true</value> | ||
194 | + <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | ||
195 | + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | ||
196 | + <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | ||
197 | + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> | ||
198 | + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> | ||
199 | + <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> | ||
200 | + <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | ||
201 | + <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | ||
202 | + <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | ||
203 | + <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | ||
204 | + <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | ||
205 | + <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | ||
206 | + <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | ||
207 | + <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | ||
208 | + <value type="int">0</value> | ||
209 | + <value type="int">1</value> | ||
210 | + <value type="int">2</value> | ||
211 | + <value type="int">3</value> | ||
212 | + <value type="int">4</value> | ||
213 | + <value type="int">5</value> | ||
214 | + <value type="int">6</value> | ||
215 | + <value type="int">7</value> | ||
216 | + <value type="int">8</value> | ||
217 | + <value type="int">9</value> | ||
218 | + <value type="int">10</value> | ||
219 | + <value type="int">11</value> | ||
220 | + <value type="int">12</value> | ||
221 | + <value type="int">13</value> | ||
222 | + <value type="int">14</value> | ||
223 | + </valuelist> | ||
224 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">apunts</value> | ||
225 | + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
226 | + <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/users/imanol/devel/qt4/apunts/apunts.pro</value> | ||
227 | + <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> | ||
228 | + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | ||
229 | + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">apunts.pro</value> | ||
230 | + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | ||
231 | + <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> | ||
232 | + <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> | ||
233 | + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> | ||
234 | + <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | ||
235 | + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> | ||
236 | + <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | ||
237 | + <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | ||
238 | + <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | ||
239 | + </valuemap> | ||
240 | + <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||
241 | + </valuemap> | ||
242 | + </data> | ||
243 | + <data> | ||
244 | + <variable>ProjectExplorer.Project.TargetCount</variable> | ||
245 | + <value type="int">1</value> | ||
246 | + </data> | ||
247 | + <data> | ||
248 | + <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | ||
249 | + <value type="QString">{e69b930c-1ca4-433f-a065-463b1709aab0}</value> | ||
250 | + </data> | ||
251 | + <data> | ||
252 | + <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | ||
253 | + <value type="int">12</value> | ||
254 | + </data> | ||
255 | +</qtcreator> |
customsqlmodel.cpp
@@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
5 | #include <QString> | 5 | #include <QString> |
6 | #include <QFont> | 6 | #include <QFont> |
7 | #include <QSqlQuery> | 7 | #include <QSqlQuery> |
8 | +#include <QColor> | ||
8 | 9 | ||
9 | CustomSQLModel::CustomSQLModel(QObject *parent) : | 10 | CustomSQLModel::CustomSQLModel(QObject *parent) : |
10 | QSqlQueryModel(parent) | 11 | QSqlQueryModel(parent) |
@@ -18,7 +19,7 @@ QVariant CustomSQLModel::data(const QModelIndex &item, int role) const | @@ -18,7 +19,7 @@ QVariant CustomSQLModel::data(const QModelIndex &item, int role) const | ||
18 | { | 19 | { |
19 | if ((role == Qt::BackgroundColorRole) && compareDates(record(item.row()).value("Data").toString())) | 20 | if ((role == Qt::BackgroundColorRole) && compareDates(record(item.row()).value("Data").toString())) |
20 | { | 21 | { |
21 | - return Qt::red; | 22 | + return QVariant(QColor(Qt::red)); |
22 | } | 23 | } |
23 | if ((role == Qt::FontRole) && compareDates(record(item.row()).value("Data").toString())) | 24 | if ((role == Qt::FontRole) && compareDates(record(item.row()).value("Data").toString())) |
24 | { | 25 | { |
customtextedit.h
ui_adddialog.h
@@ -11,18 +11,18 @@ | @@ -11,18 +11,18 @@ | ||
11 | #define UI_ADDDIALOG_H | 11 | #define UI_ADDDIALOG_H |
12 | 12 | ||
13 | #include <QtCore/QVariant> | 13 | #include <QtCore/QVariant> |
14 | -#include <QtGui/QAction> | ||
15 | -#include <QtGui/QApplication> | ||
16 | -#include <QtGui/QButtonGroup> | ||
17 | -#include <QtGui/QDialog> | ||
18 | -#include <QtGui/QDialogButtonBox> | ||
19 | -#include <QtGui/QGridLayout> | ||
20 | -#include <QtGui/QHeaderView> | ||
21 | -#include <QtGui/QLabel> | ||
22 | -#include <QtGui/QLineEdit> | ||
23 | -#include <QtGui/QSpacerItem> | ||
24 | -#include <QtGui/QTableView> | ||
25 | -#include <QtGui/QVBoxLayout> | 14 | +#include <QtWidgets/QAction> |
15 | +#include <QtWidgets/QApplication> | ||
16 | +#include <QtWidgets/QButtonGroup> | ||
17 | +#include <QtWidgets/QDialog> | ||
18 | +#include <QtWidgets/QDialogButtonBox> | ||
19 | +#include <QtWidgets/QGridLayout> | ||
20 | +#include <QtWidgets/QHeaderView> | ||
21 | +#include <QtWidgets/QLabel> | ||
22 | +#include <QtWidgets/QLineEdit> | ||
23 | +#include <QtWidgets/QSpacerItem> | ||
24 | +#include <QtWidgets/QTableView> | ||
25 | +#include <QtWidgets/QVBoxLayout> | ||
26 | #include <customtextedit.h> | 26 | #include <customtextedit.h> |
27 | 27 | ||
28 | QT_BEGIN_NAMESPACE | 28 | QT_BEGIN_NAMESPACE |
@@ -152,11 +152,11 @@ public: | @@ -152,11 +152,11 @@ public: | ||
152 | 152 | ||
153 | void retranslateUi(QDialog *AddDialog) | 153 | void retranslateUi(QDialog *AddDialog) |
154 | { | 154 | { |
155 | - AddDialog->setWindowTitle(QApplication::translate("AddDialog", "Afegir pr\303\251stec...", 0, QApplication::UnicodeUTF8)); | ||
156 | - nameLabel->setText(QApplication::translate("AddDialog", "Nom i cognoms", 0, QApplication::UnicodeUTF8)); | ||
157 | - phoneLabel->setText(QApplication::translate("AddDialog", "Tel\303\250fon", 0, QApplication::UnicodeUTF8)); | ||
158 | - commentLabel->setText(QApplication::translate("AddDialog", "Comentari (M\303\240x 140 car\303\240cters)", 0, QApplication::UnicodeUTF8)); | ||
159 | - assignaturesLabel->setText(QApplication::translate("AddDialog", "Assignatures", 0, QApplication::UnicodeUTF8)); | 155 | + AddDialog->setWindowTitle(QApplication::translate("AddDialog", "Afegir pr\303\251stec...", 0)); |
156 | + nameLabel->setText(QApplication::translate("AddDialog", "Nom i cognoms", 0)); | ||
157 | + phoneLabel->setText(QApplication::translate("AddDialog", "Tel\303\250fon", 0)); | ||
158 | + commentLabel->setText(QApplication::translate("AddDialog", "Comentari (M\303\240x 140 car\303\240cters)", 0)); | ||
159 | + assignaturesLabel->setText(QApplication::translate("AddDialog", "Assignatures", 0)); | ||
160 | } // retranslateUi | 160 | } // retranslateUi |
161 | 161 | ||
162 | }; | 162 | }; |
ui_editdialog.h
@@ -11,18 +11,18 @@ | @@ -11,18 +11,18 @@ | ||
11 | #define UI_EDITDIALOG_H | 11 | #define UI_EDITDIALOG_H |
12 | 12 | ||
13 | #include <QtCore/QVariant> | 13 | #include <QtCore/QVariant> |
14 | -#include <QtGui/QAction> | ||
15 | -#include <QtGui/QApplication> | ||
16 | -#include <QtGui/QButtonGroup> | ||
17 | -#include <QtGui/QComboBox> | ||
18 | -#include <QtGui/QDialog> | ||
19 | -#include <QtGui/QDialogButtonBox> | ||
20 | -#include <QtGui/QGridLayout> | ||
21 | -#include <QtGui/QHeaderView> | ||
22 | -#include <QtGui/QLabel> | ||
23 | -#include <QtGui/QLineEdit> | ||
24 | -#include <QtGui/QSpacerItem> | ||
25 | -#include <QtGui/QVBoxLayout> | 14 | +#include <QtWidgets/QAction> |
15 | +#include <QtWidgets/QApplication> | ||
16 | +#include <QtWidgets/QButtonGroup> | ||
17 | +#include <QtWidgets/QComboBox> | ||
18 | +#include <QtWidgets/QDialog> | ||
19 | +#include <QtWidgets/QDialogButtonBox> | ||
20 | +#include <QtWidgets/QGridLayout> | ||
21 | +#include <QtWidgets/QHeaderView> | ||
22 | +#include <QtWidgets/QLabel> | ||
23 | +#include <QtWidgets/QLineEdit> | ||
24 | +#include <QtWidgets/QSpacerItem> | ||
25 | +#include <QtWidgets/QVBoxLayout> | ||
26 | #include <customtextedit.h> | 26 | #include <customtextedit.h> |
27 | 27 | ||
28 | QT_BEGIN_NAMESPACE | 28 | QT_BEGIN_NAMESPACE |
@@ -131,11 +131,11 @@ public: | @@ -131,11 +131,11 @@ public: | ||
131 | 131 | ||
132 | void retranslateUi(QDialog *EditDialog) | 132 | void retranslateUi(QDialog *EditDialog) |
133 | { | 133 | { |
134 | - EditDialog->setWindowTitle(QApplication::translate("EditDialog", "Editar pr\303\251stec...", 0, QApplication::UnicodeUTF8)); | ||
135 | - nameLabel->setText(QApplication::translate("EditDialog", "Nom i cognoms", 0, QApplication::UnicodeUTF8)); | ||
136 | - phoneLabel->setText(QApplication::translate("EditDialog", "Tel\303\250fon", 0, QApplication::UnicodeUTF8)); | ||
137 | - commentLabel->setText(QApplication::translate("EditDialog", "Comentari (M\303\240x 140 car\303\240cters)", 0, QApplication::UnicodeUTF8)); | ||
138 | - assignaturaLabel->setText(QApplication::translate("EditDialog", "Assignatura", 0, QApplication::UnicodeUTF8)); | 134 | + EditDialog->setWindowTitle(QApplication::translate("EditDialog", "Editar pr\303\251stec...", 0)); |
135 | + nameLabel->setText(QApplication::translate("EditDialog", "Nom i cognoms", 0)); | ||
136 | + phoneLabel->setText(QApplication::translate("EditDialog", "Tel\303\250fon", 0)); | ||
137 | + commentLabel->setText(QApplication::translate("EditDialog", "Comentari (M\303\240x 140 car\303\240cters)", 0)); | ||
138 | + assignaturaLabel->setText(QApplication::translate("EditDialog", "Assignatura", 0)); | ||
139 | } // retranslateUi | 139 | } // retranslateUi |
140 | 140 | ||
141 | }; | 141 | }; |
ui_mainwindow.h
@@ -12,18 +12,18 @@ | @@ -12,18 +12,18 @@ | ||
12 | 12 | ||
13 | #include <QtCore/QLocale> | 13 | #include <QtCore/QLocale> |
14 | #include <QtCore/QVariant> | 14 | #include <QtCore/QVariant> |
15 | -#include <QtGui/QAction> | ||
16 | -#include <QtGui/QApplication> | ||
17 | -#include <QtGui/QButtonGroup> | ||
18 | -#include <QtGui/QGridLayout> | ||
19 | -#include <QtGui/QHBoxLayout> | ||
20 | -#include <QtGui/QHeaderView> | ||
21 | -#include <QtGui/QMainWindow> | ||
22 | -#include <QtGui/QPushButton> | ||
23 | -#include <QtGui/QSpacerItem> | ||
24 | -#include <QtGui/QStatusBar> | ||
25 | -#include <QtGui/QTableView> | ||
26 | -#include <QtGui/QWidget> | 15 | +#include <QtWidgets/QAction> |
16 | +#include <QtWidgets/QApplication> | ||
17 | +#include <QtWidgets/QButtonGroup> | ||
18 | +#include <QtWidgets/QGridLayout> | ||
19 | +#include <QtWidgets/QHBoxLayout> | ||
20 | +#include <QtWidgets/QHeaderView> | ||
21 | +#include <QtWidgets/QMainWindow> | ||
22 | +#include <QtWidgets/QPushButton> | ||
23 | +#include <QtWidgets/QSpacerItem> | ||
24 | +#include <QtWidgets/QStatusBar> | ||
25 | +#include <QtWidgets/QTableView> | ||
26 | +#include <QtWidgets/QWidget> | ||
27 | 27 | ||
28 | QT_BEGIN_NAMESPACE | 28 | QT_BEGIN_NAMESPACE |
29 | 29 | ||
@@ -180,20 +180,20 @@ public: | @@ -180,20 +180,20 @@ public: | ||
180 | 180 | ||
181 | void retranslateUi(QMainWindow *MainWindow) | 181 | void retranslateUi(QMainWindow *MainWindow) |
182 | { | 182 | { |
183 | - MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Aplicaci\303\263 Apunts", 0, QApplication::UnicodeUTF8)); | 183 | + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Aplicaci\303\263 Apunts", 0)); |
184 | #ifndef QT_NO_TOOLTIP | 184 | #ifndef QT_NO_TOOLTIP |
185 | - addButton->setToolTip(QApplication::translate("MainWindow", "Afegeix pr\303\251stec", 0, QApplication::UnicodeUTF8)); | 185 | + addButton->setToolTip(QApplication::translate("MainWindow", "Afegeix pr\303\251stec", 0)); |
186 | #endif // QT_NO_TOOLTIP | 186 | #endif // QT_NO_TOOLTIP |
187 | addButton->setText(QString()); | 187 | addButton->setText(QString()); |
188 | #ifndef QT_NO_TOOLTIP | 188 | #ifndef QT_NO_TOOLTIP |
189 | - deleteButton->setToolTip(QApplication::translate("MainWindow", "Esborra pr\303\251stec", 0, QApplication::UnicodeUTF8)); | 189 | + deleteButton->setToolTip(QApplication::translate("MainWindow", "Esborra pr\303\251stec", 0)); |
190 | #endif // QT_NO_TOOLTIP | 190 | #endif // QT_NO_TOOLTIP |
191 | deleteButton->setText(QString()); | 191 | deleteButton->setText(QString()); |
192 | #ifndef QT_NO_TOOLTIP | 192 | #ifndef QT_NO_TOOLTIP |
193 | - editButton->setToolTip(QApplication::translate("MainWindow", "Edita pr\303\251stec", 0, QApplication::UnicodeUTF8)); | 193 | + editButton->setToolTip(QApplication::translate("MainWindow", "Edita pr\303\251stec", 0)); |
194 | #endif // QT_NO_TOOLTIP | 194 | #endif // QT_NO_TOOLTIP |
195 | editButton->setText(QString()); | 195 | editButton->setText(QString()); |
196 | - exitButton->setText(QApplication::translate("MainWindow", "Sortir", 0, QApplication::UnicodeUTF8)); | 196 | + exitButton->setText(QApplication::translate("MainWindow", "Sortir", 0)); |
197 | } // retranslateUi | 197 | } // retranslateUi |
198 | 198 | ||
199 | }; | 199 | }; |