Commit 03118b9a9c805db3899799fdaa0b28ba02470961
1 parent
78836532
git-svn-id: svn://imanolbarba.net/PAD@51 c2ee353e-ed0d-4329-bf56-03aec153487f
Showing
21 changed files
with
136 additions
and
473 deletions
QChatClient/QChatClient.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.1, 2013-12-27T14:12:38. --> | 3 | +<!-- Written by QtCreator 2.7.0, 2014-01-07T00:45:31. --> |
4 | <qtcreator> | 4 | <qtcreator> |
5 | <data> | 5 | <data> |
6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> | 6 | <variable>ProjectExplorer.Project.ActiveTarget</variable> |
@@ -189,200 +189,6 @@ | @@ -189,200 +189,6 @@ | ||
189 | <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | 189 | <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> |
190 | </valuemap> | 190 | </valuemap> |
191 | <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | 191 | <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> |
192 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> | ||
193 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||
194 | - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> | ||
195 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | ||
196 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> | ||
197 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> | ||
198 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> | ||
199 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> | ||
200 | - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> | ||
201 | - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> | ||
202 | - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> | ||
203 | - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> | ||
204 | - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> | ||
205 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> | ||
206 | - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> | ||
207 | - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> | ||
208 | - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> | ||
209 | - <value type="int">0</value> | ||
210 | - <value type="int">1</value> | ||
211 | - <value type="int">2</value> | ||
212 | - <value type="int">3</value> | ||
213 | - <value type="int">4</value> | ||
214 | - <value type="int">5</value> | ||
215 | - <value type="int">6</value> | ||
216 | - <value type="int">7</value> | ||
217 | - <value type="int">8</value> | ||
218 | - <value type="int">9</value> | ||
219 | - <value type="int">10</value> | ||
220 | - <value type="int">11</value> | ||
221 | - <value type="int">12</value> | ||
222 | - <value type="int">13</value> | ||
223 | - <value type="int">14</value> | ||
224 | - </valuelist> | ||
225 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">QChatClient</value> | ||
226 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
227 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/imanol/devel/eclipse/PAD/QChatClient/QChatClient.pro</value> | ||
228 | - <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value> | ||
229 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> | ||
230 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">QChatClient.pro</value> | ||
231 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> | ||
232 | - <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> | ||
233 | - <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> | ||
234 | - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> | ||
235 | - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> | ||
236 | - <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> | ||
237 | - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> | ||
238 | - <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> | ||
239 | - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | ||
240 | - </valuemap> | ||
241 | - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||
242 | - </valuemap> | ||
243 | - </data> | ||
244 | - <data> | ||
245 | - <variable>ProjectExplorer.Project.Target.1</variable> | ||
246 | - <valuemap type="QVariantMap"> | ||
247 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-qt4</value> | ||
248 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-qt4</value> | ||
249 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{09071c90-33f0-49f1-8c3d-15bcbd81cbe2}</value> | ||
250 | - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value> | ||
251 | - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||
252 | - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||
253 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> | ||
254 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
255 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
256 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
257 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
258 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
259 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
260 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
261 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
262 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
263 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
264 | - </valuemap> | ||
265 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
266 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
267 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
268 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
269 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
270 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
271 | - <value type="QString">-w</value> | ||
272 | - <value type="QString">-r</value> | ||
273 | - </valuelist> | ||
274 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
275 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
276 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
277 | - </valuemap> | ||
278 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
279 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
280 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
281 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
282 | - </valuemap> | ||
283 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
284 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
285 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
286 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
287 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
288 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
289 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
290 | - <value type="QString">-w</value> | ||
291 | - <value type="QString">-r</value> | ||
292 | - </valuelist> | ||
293 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
294 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
295 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
296 | - </valuemap> | ||
297 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
298 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
299 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
300 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
301 | - </valuemap> | ||
302 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
303 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
304 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
305 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value> | ||
306 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
307 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
308 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> | ||
309 | - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/imanol/devel/eclipse/PAD/build-QChatClient-Desktop_qt4-Debug</value> | ||
310 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
311 | - </valuemap> | ||
312 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> | ||
313 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
314 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
315 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
316 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> | ||
317 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
318 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> | ||
319 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> | ||
320 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> | ||
321 | - <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> | ||
322 | - <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> | ||
323 | - </valuemap> | ||
324 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> | ||
325 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
326 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
327 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
328 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
329 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
330 | - <value type="QString">-w</value> | ||
331 | - <value type="QString">-r</value> | ||
332 | - </valuelist> | ||
333 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> | ||
334 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> | ||
335 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
336 | - </valuemap> | ||
337 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> | ||
338 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> | ||
339 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
340 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> | ||
341 | - </valuemap> | ||
342 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> | ||
343 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> | ||
344 | - <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> | ||
345 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> | ||
346 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
347 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> | ||
348 | - <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"> | ||
349 | - <value type="QString">-w</value> | ||
350 | - <value type="QString">-r</value> | ||
351 | - </valuelist> | ||
352 | - <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> | ||
353 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> | ||
354 | - <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> | ||
355 | - </valuemap> | ||
356 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> | ||
357 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> | ||
358 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
359 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> | ||
360 | - </valuemap> | ||
361 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> | ||
362 | - <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> | ||
363 | - <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> | ||
364 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value> | ||
365 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
366 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> | ||
367 | - <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> | ||
368 | - <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/imanol/devel/eclipse/PAD/build-QChatClient-Desktop_qt4-Release</value> | ||
369 | - <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> | ||
370 | - </valuemap> | ||
371 | - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> | ||
372 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||
373 | - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
374 | - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||
375 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||
376 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
377 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||
378 | - </valuemap> | ||
379 | - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||
380 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> | ||
381 | - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> | ||
382 | - <value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||
383 | - </valuemap> | ||
384 | - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||
385 | - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> | ||
386 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | 192 | <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> |
387 | <value type="bool" key="Analyzer.Project.UseGlobal">true</value> | 193 | <value type="bool" key="Analyzer.Project.UseGlobal">true</value> |
388 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> | 194 | <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> |
@@ -436,7 +242,7 @@ | @@ -436,7 +242,7 @@ | ||
436 | </data> | 242 | </data> |
437 | <data> | 243 | <data> |
438 | <variable>ProjectExplorer.Project.TargetCount</variable> | 244 | <variable>ProjectExplorer.Project.TargetCount</variable> |
439 | - <value type="int">2</value> | 245 | + <value type="int">1</value> |
440 | </data> | 246 | </data> |
441 | <data> | 247 | <data> |
442 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> | 248 | <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> |
QChatClient/chatroom.cpp
@@ -204,7 +204,6 @@ QString Chatroom::getNickname() | @@ -204,7 +204,6 @@ QString Chatroom::getNickname() | ||
204 | 204 | ||
205 | void Chatroom::updateUserList(QString userlist) | 205 | void Chatroom::updateUserList(QString userlist) |
206 | { | 206 | { |
207 | - ui->userList->clearSelection(); | ||
208 | ui->userList->clear(); | 207 | ui->userList->clear(); |
209 | QStringList users = userlist.split('\n',QString::SkipEmptyParts); | 208 | QStringList users = userlist.split('\n',QString::SkipEmptyParts); |
210 | for(int i = 0; i < users.size(); i++) | 209 | for(int i = 0; i < users.size(); i++) |
build-QChatClient-Desktop-Debug/Makefile
1 | ############################################################################# | 1 | ############################################################################# |
2 | # Makefile for building: QChatClient | 2 | # Makefile for building: QChatClient |
3 | -# Generated by qmake (3.0) (Qt 5.0.2) on: vie dic 27 14:11:32 2013 | 3 | +# Generated by qmake (3.0) (Qt 5.0.1) on: mar ene 7 05:02:24 2014 |
4 | # Project: ../QChatClient/QChatClient.pro | 4 | # Project: ../QChatClient/QChatClient.pro |
5 | # Template: app | 5 | # Template: app |
6 | -# Command: /usr/lib/x86_64-linux-gnu/qt5/bin/qmake -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro | 6 | +# Command: /usr/lib/i386-linux-gnu/qt5/bin/qmake -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro |
7 | ############################################################################# | 7 | ############################################################################# |
8 | 8 | ||
9 | MAKEFILE = Makefile | 9 | MAKEFILE = Makefile |
@@ -13,15 +13,15 @@ MAKEFILE = Makefile | @@ -13,15 +13,15 @@ MAKEFILE = Makefile | ||
13 | CC = gcc | 13 | CC = gcc |
14 | CXX = g++ | 14 | CXX = g++ |
15 | DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB | 15 | DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB |
16 | -CFLAGS = -m64 -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) | ||
17 | -CXXFLAGS = -m64 -pipe -std=c++11 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) | ||
18 | -INCPATH = -I/usr/share/qt5/mkspecs/linux-g++-64 -I../QChatClient -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -I. -I. | 16 | +CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) |
17 | +CXXFLAGS = -pipe -std=c++11 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) | ||
18 | +INCPATH = -I/usr/share/qt5/mkspecs/linux-g++ -I../QChatClient -I/usr/include/qt5 -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtGui -I/usr/include/qt5/QtCore -I. -I. -I. | ||
19 | LINK = g++ | 19 | LINK = g++ |
20 | -LFLAGS = -m64 | ||
21 | -LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5Widgets -L/usr/lib/x86_64-linux-gnu -lQt5Gui -lQt5Core -lGL -lpthread | 20 | +LFLAGS = |
21 | +LIBS = $(SUBLIBS) -lQt5Widgets -L/usr/lib/i386-linux-gnu -lQt5Gui -lQt5Core -lGL -lpthread | ||
22 | AR = ar cqs | 22 | AR = ar cqs |
23 | RANLIB = | 23 | RANLIB = |
24 | -QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake | 24 | +QMAKE = /usr/lib/i386-linux-gnu/qt5/bin/qmake |
25 | TAR = tar -cf | 25 | TAR = tar -cf |
26 | COMPRESS = gzip -9f | 26 | COMPRESS = gzip -9f |
27 | COPY = cp -f | 27 | COPY = cp -f |
@@ -86,19 +86,25 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ | @@ -86,19 +86,25 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ | ||
86 | /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ | 86 | /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ |
87 | /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ | 87 | /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ |
88 | /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ | 88 | /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ |
89 | + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \ | ||
90 | + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \ | ||
91 | + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \ | ||
92 | + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \ | ||
93 | + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ | ||
89 | /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ | 94 | /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ |
90 | /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ | 95 | /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ |
91 | /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ | 96 | /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ |
92 | /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ | 97 | /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ |
93 | /usr/share/qt5/mkspecs/features/qt_functions.prf \ | 98 | /usr/share/qt5/mkspecs/features/qt_functions.prf \ |
94 | /usr/share/qt5/mkspecs/features/qt_config.prf \ | 99 | /usr/share/qt5/mkspecs/features/qt_config.prf \ |
95 | - /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf \ | 100 | + /usr/share/qt5/mkspecs/linux-g++/qmake.conf \ |
96 | /usr/share/qt5/mkspecs/features/spec_post.prf \ | 101 | /usr/share/qt5/mkspecs/features/spec_post.prf \ |
97 | /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ | 102 | /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ |
98 | /usr/share/qt5/mkspecs/features/default_pre.prf \ | 103 | /usr/share/qt5/mkspecs/features/default_pre.prf \ |
99 | /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ | 104 | /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ |
100 | - /usr/share/qt5/mkspecs/features/resolve_config.prf \ | 105 | + /usr/share/qt5/mkspecs/features/debug.prf \ |
101 | /usr/share/qt5/mkspecs/features/default_post.prf \ | 106 | /usr/share/qt5/mkspecs/features/default_post.prf \ |
107 | + /usr/share/qt5/mkspecs/features/shared.prf \ | ||
102 | /usr/share/qt5/mkspecs/features/qml_debug.prf \ | 108 | /usr/share/qt5/mkspecs/features/qml_debug.prf \ |
103 | /usr/share/qt5/mkspecs/features/declarative_debug.prf \ | 109 | /usr/share/qt5/mkspecs/features/declarative_debug.prf \ |
104 | /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ | 110 | /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ |
@@ -149,7 +155,7 @@ $(TARGET): ui_chatwindow.h ui_loginscreen.h ui_chatroom.h $(OBJECTS) | @@ -149,7 +155,7 @@ $(TARGET): ui_chatwindow.h ui_loginscreen.h ui_chatroom.h $(OBJECTS) | ||
149 | $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) | 155 | $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) |
150 | { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9]\+\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true | 156 | { test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9]\+\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true |
151 | 157 | ||
152 | -Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf /usr/share/qt5/mkspecs/features/spec_pre.prf \ | 158 | +Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake.conf /usr/share/qt5/mkspecs/features/spec_pre.prf \ |
153 | /usr/share/qt5/mkspecs/common/shell-unix.conf \ | 159 | /usr/share/qt5/mkspecs/common/shell-unix.conf \ |
154 | /usr/share/qt5/mkspecs/common/unix.conf \ | 160 | /usr/share/qt5/mkspecs/common/unix.conf \ |
155 | /usr/share/qt5/mkspecs/common/linux.conf \ | 161 | /usr/share/qt5/mkspecs/common/linux.conf \ |
@@ -167,19 +173,25 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | @@ -167,19 +173,25 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | ||
167 | /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ | 173 | /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri \ |
168 | /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ | 174 | /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri \ |
169 | /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ | 175 | /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \ |
176 | + /usr/share/qt5/mkspecs/modules/qt_lib_qml.pri \ | ||
177 | + /usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri \ | ||
178 | + /usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri \ | ||
179 | + /usr/share/qt5/mkspecs/modules/qt_lib_quick.pri \ | ||
180 | + /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ | ||
170 | /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ | 181 | /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ |
171 | /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ | 182 | /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ |
172 | /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ | 183 | /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ |
173 | /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ | 184 | /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ |
174 | /usr/share/qt5/mkspecs/features/qt_functions.prf \ | 185 | /usr/share/qt5/mkspecs/features/qt_functions.prf \ |
175 | /usr/share/qt5/mkspecs/features/qt_config.prf \ | 186 | /usr/share/qt5/mkspecs/features/qt_config.prf \ |
176 | - /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf \ | 187 | + /usr/share/qt5/mkspecs/linux-g++/qmake.conf \ |
177 | /usr/share/qt5/mkspecs/features/spec_post.prf \ | 188 | /usr/share/qt5/mkspecs/features/spec_post.prf \ |
178 | /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ | 189 | /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ |
179 | /usr/share/qt5/mkspecs/features/default_pre.prf \ | 190 | /usr/share/qt5/mkspecs/features/default_pre.prf \ |
180 | /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ | 191 | /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ |
181 | - /usr/share/qt5/mkspecs/features/resolve_config.prf \ | 192 | + /usr/share/qt5/mkspecs/features/debug.prf \ |
182 | /usr/share/qt5/mkspecs/features/default_post.prf \ | 193 | /usr/share/qt5/mkspecs/features/default_post.prf \ |
194 | + /usr/share/qt5/mkspecs/features/shared.prf \ | ||
183 | /usr/share/qt5/mkspecs/features/qml_debug.prf \ | 195 | /usr/share/qt5/mkspecs/features/qml_debug.prf \ |
184 | /usr/share/qt5/mkspecs/features/declarative_debug.prf \ | 196 | /usr/share/qt5/mkspecs/features/declarative_debug.prf \ |
185 | /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ | 197 | /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ |
@@ -196,10 +208,10 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | @@ -196,10 +208,10 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | ||
196 | /usr/share/qt5/mkspecs/features/yacc.prf \ | 208 | /usr/share/qt5/mkspecs/features/yacc.prf \ |
197 | /usr/share/qt5/mkspecs/features/lex.prf \ | 209 | /usr/share/qt5/mkspecs/features/lex.prf \ |
198 | ../QChatClient/QChatClient.pro \ | 210 | ../QChatClient/QChatClient.pro \ |
199 | - /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \ | ||
200 | - /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \ | ||
201 | - /usr/lib/x86_64-linux-gnu/libQt5Core.prl | ||
202 | - $(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro | 211 | + /usr/lib/i386-linux-gnu/libQt5Widgets.prl \ |
212 | + /usr/lib/i386-linux-gnu/libQt5Gui.prl \ | ||
213 | + /usr/lib/i386-linux-gnu/libQt5Core.prl | ||
214 | + $(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro | ||
203 | /usr/share/qt5/mkspecs/features/spec_pre.prf: | 215 | /usr/share/qt5/mkspecs/features/spec_pre.prf: |
204 | /usr/share/qt5/mkspecs/common/shell-unix.conf: | 216 | /usr/share/qt5/mkspecs/common/shell-unix.conf: |
205 | /usr/share/qt5/mkspecs/common/unix.conf: | 217 | /usr/share/qt5/mkspecs/common/unix.conf: |
@@ -218,19 +230,25 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | @@ -218,19 +230,25 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | ||
218 | /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri: | 230 | /usr/share/qt5/mkspecs/modules/qt_lib_opengl.pri: |
219 | /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri: | 231 | /usr/share/qt5/mkspecs/modules/qt_lib_platformsupport.pri: |
220 | /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri: | 232 | /usr/share/qt5/mkspecs/modules/qt_lib_printsupport.pri: |
233 | +/usr/share/qt5/mkspecs/modules/qt_lib_qml.pri: | ||
234 | +/usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools.pri: | ||
235 | +/usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri: | ||
236 | +/usr/share/qt5/mkspecs/modules/qt_lib_quick.pri: | ||
237 | +/usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri: | ||
221 | /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri: | 238 | /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri: |
222 | /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri: | 239 | /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri: |
223 | /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri: | 240 | /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri: |
224 | /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri: | 241 | /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri: |
225 | /usr/share/qt5/mkspecs/features/qt_functions.prf: | 242 | /usr/share/qt5/mkspecs/features/qt_functions.prf: |
226 | /usr/share/qt5/mkspecs/features/qt_config.prf: | 243 | /usr/share/qt5/mkspecs/features/qt_config.prf: |
227 | -/usr/share/qt5/mkspecs/linux-g++-64/qmake.conf: | 244 | +/usr/share/qt5/mkspecs/linux-g++/qmake.conf: |
228 | /usr/share/qt5/mkspecs/features/spec_post.prf: | 245 | /usr/share/qt5/mkspecs/features/spec_post.prf: |
229 | /usr/share/qt5/mkspecs/features/exclusive_builds.prf: | 246 | /usr/share/qt5/mkspecs/features/exclusive_builds.prf: |
230 | /usr/share/qt5/mkspecs/features/default_pre.prf: | 247 | /usr/share/qt5/mkspecs/features/default_pre.prf: |
231 | /usr/share/qt5/mkspecs/features/unix/default_pre.prf: | 248 | /usr/share/qt5/mkspecs/features/unix/default_pre.prf: |
232 | -/usr/share/qt5/mkspecs/features/resolve_config.prf: | 249 | +/usr/share/qt5/mkspecs/features/debug.prf: |
233 | /usr/share/qt5/mkspecs/features/default_post.prf: | 250 | /usr/share/qt5/mkspecs/features/default_post.prf: |
251 | +/usr/share/qt5/mkspecs/features/shared.prf: | ||
234 | /usr/share/qt5/mkspecs/features/qml_debug.prf: | 252 | /usr/share/qt5/mkspecs/features/qml_debug.prf: |
235 | /usr/share/qt5/mkspecs/features/declarative_debug.prf: | 253 | /usr/share/qt5/mkspecs/features/declarative_debug.prf: |
236 | /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: | 254 | /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: |
@@ -247,16 +265,16 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | @@ -247,16 +265,16 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qma | ||
247 | /usr/share/qt5/mkspecs/features/yacc.prf: | 265 | /usr/share/qt5/mkspecs/features/yacc.prf: |
248 | /usr/share/qt5/mkspecs/features/lex.prf: | 266 | /usr/share/qt5/mkspecs/features/lex.prf: |
249 | ../QChatClient/QChatClient.pro: | 267 | ../QChatClient/QChatClient.pro: |
250 | -/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl: | ||
251 | -/usr/lib/x86_64-linux-gnu/libQt5Gui.prl: | ||
252 | -/usr/lib/x86_64-linux-gnu/libQt5Core.prl: | 268 | +/usr/lib/i386-linux-gnu/libQt5Widgets.prl: |
269 | +/usr/lib/i386-linux-gnu/libQt5Gui.prl: | ||
270 | +/usr/lib/i386-linux-gnu/libQt5Core.prl: | ||
253 | qmake: FORCE | 271 | qmake: FORCE |
254 | - @$(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro | 272 | + @$(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro |
255 | 273 | ||
256 | qmake_all: FORCE | 274 | qmake_all: FORCE |
257 | 275 | ||
258 | dist: | 276 | dist: |
259 | - @test -d .tmp/QChatClient1.0.0 || mkdir -p .tmp/QChatClient1.0.0 | 277 | + @test -d .tmp/QChatClient1.0.0 || $(MKDIR) .tmp/QChatClient1.0.0 |
260 | $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/loginscreen.h ../QChatClient/chatroom.h ../QChatClient/SocketException.h ../QChatClient/Socket.h ../QChatClient/chatwidget.h ../QChatClient/chatwindow.h ../QChatClient/chatinputtext.h .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/main.cpp ../QChatClient/loginscreen.cpp ../QChatClient/chatroom.cpp ../QChatClient/Socket.cpp ../QChatClient/chatwidget.cpp ../QChatClient/chatwindow.cpp ../QChatClient/chatinputtext.cpp .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.ui ../QChatClient/loginscreen.ui ../QChatClient/chatroom.ui .tmp/QChatClient1.0.0/ && (cd `dirname .tmp/QChatClient1.0.0` && $(TAR) QChatClient1.0.0.tar QChatClient1.0.0 && $(COMPRESS) QChatClient1.0.0.tar) && $(MOVE) `dirname .tmp/QChatClient1.0.0`/QChatClient1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/QChatClient1.0.0 | 278 | $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/loginscreen.h ../QChatClient/chatroom.h ../QChatClient/SocketException.h ../QChatClient/Socket.h ../QChatClient/chatwidget.h ../QChatClient/chatwindow.h ../QChatClient/chatinputtext.h .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/main.cpp ../QChatClient/loginscreen.cpp ../QChatClient/chatroom.cpp ../QChatClient/Socket.cpp ../QChatClient/chatwidget.cpp ../QChatClient/chatwindow.cpp ../QChatClient/chatinputtext.cpp .tmp/QChatClient1.0.0/ && $(COPY_FILE) --parents ../QChatClient/chatwindow.ui ../QChatClient/loginscreen.ui ../QChatClient/chatroom.ui .tmp/QChatClient1.0.0/ && (cd `dirname .tmp/QChatClient1.0.0` && $(TAR) QChatClient1.0.0.tar QChatClient1.0.0 && $(COMPRESS) QChatClient1.0.0.tar) && $(MOVE) `dirname .tmp/QChatClient1.0.0`/QChatClient1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/QChatClient1.0.0 |
261 | 279 | ||
262 | 280 | ||
@@ -320,7 +338,6 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ | @@ -320,7 +338,6 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ | ||
320 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 338 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
321 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 339 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
322 | /usr/include/qt5/QtCore/qatomic_power.h \ | 340 | /usr/include/qt5/QtCore/qatomic_power.h \ |
323 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
324 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 341 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
325 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 342 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
326 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 343 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -408,7 +425,7 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ | @@ -408,7 +425,7 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ | ||
408 | ../QChatClient/SocketException.h \ | 425 | ../QChatClient/SocketException.h \ |
409 | ../QChatClient/chatwindow.h \ | 426 | ../QChatClient/chatwindow.h \ |
410 | ../QChatClient/loginscreen.h | 427 | ../QChatClient/loginscreen.h |
411 | - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/loginscreen.h -o moc_loginscreen.cpp | 428 | + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/loginscreen.h -o moc_loginscreen.cpp |
412 | 429 | ||
413 | moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | 430 | moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ |
414 | /usr/include/qt5/QtWidgets/qmainwindow.h \ | 431 | /usr/include/qt5/QtWidgets/qmainwindow.h \ |
@@ -443,7 +460,6 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | @@ -443,7 +460,6 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | ||
443 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 460 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
444 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 461 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
445 | /usr/include/qt5/QtCore/qatomic_power.h \ | 462 | /usr/include/qt5/QtCore/qatomic_power.h \ |
446 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
447 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 463 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
448 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 464 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
449 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 465 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -531,7 +547,7 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | @@ -531,7 +547,7 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | ||
531 | ../QChatClient/Socket.h \ | 547 | ../QChatClient/Socket.h \ |
532 | ../QChatClient/SocketException.h \ | 548 | ../QChatClient/SocketException.h \ |
533 | ../QChatClient/chatroom.h | 549 | ../QChatClient/chatroom.h |
534 | - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatroom.h -o moc_chatroom.cpp | 550 | + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatroom.h -o moc_chatroom.cpp |
535 | 551 | ||
536 | moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | 552 | moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ |
537 | /usr/include/qt5/QtWidgets/qtextedit.h \ | 553 | /usr/include/qt5/QtWidgets/qtextedit.h \ |
@@ -568,7 +584,6 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | @@ -568,7 +584,6 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | ||
568 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 584 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
569 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 585 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
570 | /usr/include/qt5/QtCore/qatomic_power.h \ | 586 | /usr/include/qt5/QtCore/qatomic_power.h \ |
571 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
572 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 587 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
573 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 588 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
574 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 589 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -656,7 +671,7 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | @@ -656,7 +671,7 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | ||
656 | /usr/include/qt5/QtCore/QFile \ | 671 | /usr/include/qt5/QtCore/QFile \ |
657 | /usr/include/qt5/QtCore/QTextStream \ | 672 | /usr/include/qt5/QtCore/QTextStream \ |
658 | ../QChatClient/chatwidget.h | 673 | ../QChatClient/chatwidget.h |
659 | - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwidget.h -o moc_chatwidget.cpp | 674 | + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwidget.h -o moc_chatwidget.cpp |
660 | 675 | ||
661 | moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | 676 | moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ |
662 | /usr/include/qt5/QtWidgets/qmainwindow.h \ | 677 | /usr/include/qt5/QtWidgets/qmainwindow.h \ |
@@ -691,7 +706,6 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | @@ -691,7 +706,6 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | ||
691 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 706 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
692 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 707 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
693 | /usr/include/qt5/QtCore/qatomic_power.h \ | 708 | /usr/include/qt5/QtCore/qatomic_power.h \ |
694 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
695 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 709 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
696 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 710 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
697 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 711 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -779,7 +793,7 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | @@ -779,7 +793,7 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ | ||
779 | ../QChatClient/SocketException.h \ | 793 | ../QChatClient/SocketException.h \ |
780 | ../QChatClient/chatwindow.h \ | 794 | ../QChatClient/chatwindow.h \ |
781 | ../QChatClient/chatwindow.h | 795 | ../QChatClient/chatwindow.h |
782 | - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwindow.h -o moc_chatwindow.cpp | 796 | + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwindow.h -o moc_chatwindow.cpp |
783 | 797 | ||
784 | moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | 798 | moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ |
785 | /usr/include/qt5/QtWidgets/qtextedit.h \ | 799 | /usr/include/qt5/QtWidgets/qtextedit.h \ |
@@ -816,7 +830,6 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | @@ -816,7 +830,6 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | ||
816 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 830 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
817 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 831 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
818 | /usr/include/qt5/QtCore/qatomic_power.h \ | 832 | /usr/include/qt5/QtCore/qatomic_power.h \ |
819 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
820 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 833 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
821 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 834 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
822 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 835 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -898,7 +911,7 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | @@ -898,7 +911,7 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ | ||
898 | /usr/include/qt5/QtGui/qpen.h \ | 911 | /usr/include/qt5/QtGui/qpen.h \ |
899 | /usr/include/qt5/QtGui/QKeyEvent \ | 912 | /usr/include/qt5/QtGui/QKeyEvent \ |
900 | ../QChatClient/chatinputtext.h | 913 | ../QChatClient/chatinputtext.h |
901 | - /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatinputtext.h -o moc_chatinputtext.cpp | 914 | + /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatinputtext.h -o moc_chatinputtext.cpp |
902 | 915 | ||
903 | compiler_wayland-code_make_all: | 916 | compiler_wayland-code_make_all: |
904 | compiler_wayland-code_clean: | 917 | compiler_wayland-code_clean: |
@@ -945,7 +958,6 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ | @@ -945,7 +958,6 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ | ||
945 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 958 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
946 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 959 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
947 | /usr/include/qt5/QtCore/qatomic_power.h \ | 960 | /usr/include/qt5/QtCore/qatomic_power.h \ |
948 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
949 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 961 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
950 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 962 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
951 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 963 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1067,7 +1079,6 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ | @@ -1067,7 +1079,6 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ | ||
1067 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1079 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1068 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1080 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1069 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1081 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1070 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1071 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1082 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1072 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1083 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1073 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1084 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1148,10 +1159,10 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ | @@ -1148,10 +1159,10 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ | ||
1148 | /usr/include/qt5/QtGui/qtextformat.h \ | 1159 | /usr/include/qt5/QtGui/qtextformat.h \ |
1149 | /usr/include/qt5/QtGui/qpen.h \ | 1160 | /usr/include/qt5/QtGui/qpen.h \ |
1150 | /usr/include/qt5/QtGui/QKeyEvent | 1161 | /usr/include/qt5/QtGui/QKeyEvent |
1151 | - /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/chatwindow.ui -o ui_chatwindow.h | 1162 | + /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/chatwindow.ui -o ui_chatwindow.h |
1152 | 1163 | ||
1153 | ui_loginscreen.h: ../QChatClient/loginscreen.ui | 1164 | ui_loginscreen.h: ../QChatClient/loginscreen.ui |
1154 | - /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/loginscreen.ui -o ui_loginscreen.h | 1165 | + /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/loginscreen.ui -o ui_loginscreen.h |
1155 | 1166 | ||
1156 | ui_chatroom.h: ../QChatClient/chatroom.ui \ | 1167 | ui_chatroom.h: ../QChatClient/chatroom.ui \ |
1157 | ../QChatClient/chatwidget.h \ | 1168 | ../QChatClient/chatwidget.h \ |
@@ -1191,7 +1202,6 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ | @@ -1191,7 +1202,6 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ | ||
1191 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1202 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1192 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1203 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1193 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1204 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1194 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1195 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1205 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1196 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1206 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1197 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1207 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1313,7 +1323,6 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ | @@ -1313,7 +1323,6 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ | ||
1313 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1323 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1314 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1324 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1315 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1325 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1316 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1317 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1326 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1318 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1327 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1319 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1328 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1394,7 +1403,7 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ | @@ -1394,7 +1403,7 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ | ||
1394 | /usr/include/qt5/QtGui/qtextformat.h \ | 1403 | /usr/include/qt5/QtGui/qtextformat.h \ |
1395 | /usr/include/qt5/QtGui/qpen.h \ | 1404 | /usr/include/qt5/QtGui/qpen.h \ |
1396 | /usr/include/qt5/QtGui/QKeyEvent | 1405 | /usr/include/qt5/QtGui/QKeyEvent |
1397 | - /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/chatroom.ui -o ui_chatroom.h | 1406 | + /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/chatroom.ui -o ui_chatroom.h |
1398 | 1407 | ||
1399 | compiler_yacc_decl_make_all: | 1408 | compiler_yacc_decl_make_all: |
1400 | compiler_yacc_decl_clean: | 1409 | compiler_yacc_decl_clean: |
@@ -1440,7 +1449,6 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ | @@ -1440,7 +1449,6 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ | ||
1440 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1449 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1441 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1450 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1442 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1451 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1443 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1444 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1452 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1445 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1453 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1446 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1454 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1569,7 +1577,6 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ | @@ -1569,7 +1577,6 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ | ||
1569 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1577 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1570 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1578 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1571 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1579 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1572 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1573 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1580 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1574 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1581 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1575 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1582 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1655,53 +1662,7 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ | @@ -1655,53 +1662,7 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ | ||
1655 | ../QChatClient/chatwindow.h \ | 1662 | ../QChatClient/chatwindow.h \ |
1656 | ../QChatClient/Socket.h \ | 1663 | ../QChatClient/Socket.h \ |
1657 | ../QChatClient/SocketException.h \ | 1664 | ../QChatClient/SocketException.h \ |
1658 | - ui_loginscreen.h \ | ||
1659 | - /usr/include/qt5/QtCore/QVariant \ | ||
1660 | - /usr/include/qt5/QtWidgets/QAction \ | ||
1661 | - /usr/include/qt5/QtWidgets/qaction.h \ | ||
1662 | - /usr/include/qt5/QtWidgets/qactiongroup.h \ | ||
1663 | - /usr/include/qt5/QtWidgets/QApplication \ | ||
1664 | - /usr/include/qt5/QtWidgets/qapplication.h \ | ||
1665 | - /usr/include/qt5/QtCore/qcoreapplication.h \ | ||
1666 | - /usr/include/qt5/QtCore/qeventloop.h \ | ||
1667 | - /usr/include/qt5/QtWidgets/qdesktopwidget.h \ | ||
1668 | - /usr/include/qt5/QtGui/qguiapplication.h \ | ||
1669 | - /usr/include/qt5/QtGui/qinputmethod.h \ | ||
1670 | - /usr/include/qt5/QtWidgets/QButtonGroup \ | ||
1671 | - /usr/include/qt5/QtWidgets/qbuttongroup.h \ | ||
1672 | - /usr/include/qt5/QtWidgets/QGridLayout \ | ||
1673 | - /usr/include/qt5/QtWidgets/qgridlayout.h \ | ||
1674 | - /usr/include/qt5/QtWidgets/qlayout.h \ | ||
1675 | - /usr/include/qt5/QtWidgets/qlayoutitem.h \ | ||
1676 | - /usr/include/qt5/QtWidgets/qboxlayout.h \ | ||
1677 | - /usr/include/qt5/QtWidgets/QHeaderView \ | ||
1678 | - /usr/include/qt5/QtWidgets/qheaderview.h \ | ||
1679 | - /usr/include/qt5/QtWidgets/qabstractitemview.h \ | ||
1680 | - /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ | ||
1681 | - /usr/include/qt5/QtWidgets/qframe.h \ | ||
1682 | - /usr/include/qt5/QtCore/qitemselectionmodel.h \ | ||
1683 | - /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ | ||
1684 | - /usr/include/qt5/QtWidgets/qstyleoption.h \ | ||
1685 | - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ | ||
1686 | - /usr/include/qt5/QtGui/qvalidator.h \ | ||
1687 | - /usr/include/qt5/QtWidgets/qslider.h \ | ||
1688 | - /usr/include/qt5/QtWidgets/qabstractslider.h \ | ||
1689 | - /usr/include/qt5/QtWidgets/qstyle.h \ | ||
1690 | - /usr/include/qt5/QtWidgets/qtabbar.h \ | ||
1691 | - /usr/include/qt5/QtWidgets/qrubberband.h \ | ||
1692 | - /usr/include/qt5/QtWidgets/QLabel \ | ||
1693 | - /usr/include/qt5/QtWidgets/qlabel.h \ | ||
1694 | - /usr/include/qt5/QtWidgets/QLineEdit \ | ||
1695 | - /usr/include/qt5/QtWidgets/qlineedit.h \ | ||
1696 | - /usr/include/qt5/QtGui/qtextcursor.h \ | ||
1697 | - /usr/include/qt5/QtGui/qtextformat.h \ | ||
1698 | - /usr/include/qt5/QtGui/qpen.h \ | ||
1699 | - /usr/include/qt5/QtGui/qtextoption.h \ | ||
1700 | - /usr/include/qt5/QtWidgets/QPushButton \ | ||
1701 | - /usr/include/qt5/QtWidgets/qpushbutton.h \ | ||
1702 | - /usr/include/qt5/QtWidgets/qabstractbutton.h \ | ||
1703 | - /usr/include/qt5/QtWidgets/QSpacerItem \ | ||
1704 | - /usr/include/qt5/QtWidgets/QWidget | 1665 | + ui_loginscreen.h |
1705 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o loginscreen.o ../QChatClient/loginscreen.cpp | 1666 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o loginscreen.o ../QChatClient/loginscreen.cpp |
1706 | 1667 | ||
1707 | chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ | 1668 | chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ |
@@ -1738,7 +1699,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ | @@ -1738,7 +1699,6 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ | ||
1738 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1699 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1739 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1700 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1740 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1701 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1741 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1742 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1702 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1743 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1703 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1744 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1704 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -1824,69 +1784,7 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ | @@ -1824,69 +1784,7 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ | ||
1824 | ../QChatClient/Socket.h \ | 1784 | ../QChatClient/Socket.h \ |
1825 | ../QChatClient/SocketException.h \ | 1785 | ../QChatClient/SocketException.h \ |
1826 | ../QChatClient/chatwindow.h \ | 1786 | ../QChatClient/chatwindow.h \ |
1827 | - ui_chatroom.h \ | ||
1828 | - /usr/include/qt5/QtCore/QVariant \ | ||
1829 | - /usr/include/qt5/QtWidgets/QAction \ | ||
1830 | - /usr/include/qt5/QtWidgets/qaction.h \ | ||
1831 | - /usr/include/qt5/QtWidgets/qactiongroup.h \ | ||
1832 | - /usr/include/qt5/QtWidgets/QApplication \ | ||
1833 | - /usr/include/qt5/QtWidgets/qapplication.h \ | ||
1834 | - /usr/include/qt5/QtCore/qcoreapplication.h \ | ||
1835 | - /usr/include/qt5/QtCore/qeventloop.h \ | ||
1836 | - /usr/include/qt5/QtWidgets/qdesktopwidget.h \ | ||
1837 | - /usr/include/qt5/QtGui/qguiapplication.h \ | ||
1838 | - /usr/include/qt5/QtGui/qinputmethod.h \ | ||
1839 | - /usr/include/qt5/QtWidgets/QButtonGroup \ | ||
1840 | - /usr/include/qt5/QtWidgets/qbuttongroup.h \ | ||
1841 | - /usr/include/qt5/QtWidgets/QGridLayout \ | ||
1842 | - /usr/include/qt5/QtWidgets/qgridlayout.h \ | ||
1843 | - /usr/include/qt5/QtWidgets/qlayout.h \ | ||
1844 | - /usr/include/qt5/QtWidgets/qlayoutitem.h \ | ||
1845 | - /usr/include/qt5/QtWidgets/qboxlayout.h \ | ||
1846 | - /usr/include/qt5/QtWidgets/QHeaderView \ | ||
1847 | - /usr/include/qt5/QtWidgets/qheaderview.h \ | ||
1848 | - /usr/include/qt5/QtWidgets/qabstractitemview.h \ | ||
1849 | - /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ | ||
1850 | - /usr/include/qt5/QtWidgets/qframe.h \ | ||
1851 | - /usr/include/qt5/QtCore/qitemselectionmodel.h \ | ||
1852 | - /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ | ||
1853 | - /usr/include/qt5/QtWidgets/qstyleoption.h \ | ||
1854 | - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ | ||
1855 | - /usr/include/qt5/QtGui/qvalidator.h \ | ||
1856 | - /usr/include/qt5/QtWidgets/qslider.h \ | ||
1857 | - /usr/include/qt5/QtWidgets/qabstractslider.h \ | ||
1858 | - /usr/include/qt5/QtWidgets/qstyle.h \ | ||
1859 | - /usr/include/qt5/QtWidgets/qtabbar.h \ | ||
1860 | - /usr/include/qt5/QtWidgets/qrubberband.h \ | ||
1861 | - /usr/include/qt5/QtWidgets/QListWidget \ | ||
1862 | - /usr/include/qt5/QtWidgets/qlistwidget.h \ | ||
1863 | - /usr/include/qt5/QtWidgets/qlistview.h \ | ||
1864 | - /usr/include/qt5/QtWidgets/QMenu \ | ||
1865 | - /usr/include/qt5/QtWidgets/qmenu.h \ | ||
1866 | - /usr/include/qt5/QtWidgets/QMenuBar \ | ||
1867 | - /usr/include/qt5/QtWidgets/qmenubar.h \ | ||
1868 | - /usr/include/qt5/QtWidgets/QPushButton \ | ||
1869 | - /usr/include/qt5/QtWidgets/qpushbutton.h \ | ||
1870 | - /usr/include/qt5/QtWidgets/qabstractbutton.h \ | ||
1871 | - /usr/include/qt5/QtWidgets/QSplitter \ | ||
1872 | - /usr/include/qt5/QtWidgets/qsplitter.h \ | ||
1873 | - /usr/include/qt5/QtWidgets/QWidget \ | ||
1874 | - ../QChatClient/chatinputtext.h \ | ||
1875 | - /usr/include/qt5/QtWidgets/QTextEdit \ | ||
1876 | - /usr/include/qt5/QtWidgets/qtextedit.h \ | ||
1877 | - /usr/include/qt5/QtGui/qtextdocument.h \ | ||
1878 | - /usr/include/qt5/QtGui/qtextoption.h \ | ||
1879 | - /usr/include/qt5/QtGui/qtextcursor.h \ | ||
1880 | - /usr/include/qt5/QtGui/qtextformat.h \ | ||
1881 | - /usr/include/qt5/QtGui/qpen.h \ | ||
1882 | - /usr/include/qt5/QtGui/QKeyEvent \ | ||
1883 | - ../QChatClient/chatwidget.h \ | ||
1884 | - /usr/include/qt5/QtWidgets/QFileDialog \ | ||
1885 | - /usr/include/qt5/QtWidgets/qfiledialog.h \ | ||
1886 | - /usr/include/qt5/QtCore/qdir.h \ | ||
1887 | - /usr/include/qt5/QtCore/qfileinfo.h \ | ||
1888 | - /usr/include/qt5/QtCore/QFile \ | ||
1889 | - /usr/include/qt5/QtCore/QTextStream | 1787 | + ui_chatroom.h |
1890 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatroom.o ../QChatClient/chatroom.cpp | 1788 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatroom.o ../QChatClient/chatroom.cpp |
1891 | 1789 | ||
1892 | Socket.o: ../QChatClient/Socket.cpp ../QChatClient/Socket.h \ | 1790 | Socket.o: ../QChatClient/Socket.cpp ../QChatClient/Socket.h \ |
@@ -1929,7 +1827,6 @@ chatwidget.o: ../QChatClient/chatwidget.cpp ../QChatClient/chatwidget.h \ | @@ -1929,7 +1827,6 @@ chatwidget.o: ../QChatClient/chatwidget.cpp ../QChatClient/chatwidget.h \ | ||
1929 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1827 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
1930 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1828 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
1931 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1829 | /usr/include/qt5/QtCore/qatomic_power.h \ |
1932 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
1933 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1830 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
1934 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1831 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
1935 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1832 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -2052,7 +1949,6 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ | @@ -2052,7 +1949,6 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ | ||
2052 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 1949 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
2053 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 1950 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
2054 | /usr/include/qt5/QtCore/qatomic_power.h \ | 1951 | /usr/include/qt5/QtCore/qatomic_power.h \ |
2055 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
2056 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 1952 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
2057 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 1953 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
2058 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 1954 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
@@ -2138,67 +2034,7 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ | @@ -2138,67 +2034,7 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ | ||
2138 | /usr/include/qt5/QtCore/QRegExp \ | 2034 | /usr/include/qt5/QtCore/QRegExp \ |
2139 | ../QChatClient/Socket.h \ | 2035 | ../QChatClient/Socket.h \ |
2140 | ../QChatClient/SocketException.h \ | 2036 | ../QChatClient/SocketException.h \ |
2141 | - ui_chatwindow.h \ | ||
2142 | - /usr/include/qt5/QtCore/QVariant \ | ||
2143 | - /usr/include/qt5/QtWidgets/QAction \ | ||
2144 | - /usr/include/qt5/QtWidgets/qaction.h \ | ||
2145 | - /usr/include/qt5/QtWidgets/qactiongroup.h \ | ||
2146 | - /usr/include/qt5/QtWidgets/QApplication \ | ||
2147 | - /usr/include/qt5/QtWidgets/qapplication.h \ | ||
2148 | - /usr/include/qt5/QtCore/qcoreapplication.h \ | ||
2149 | - /usr/include/qt5/QtCore/qeventloop.h \ | ||
2150 | - /usr/include/qt5/QtWidgets/qdesktopwidget.h \ | ||
2151 | - /usr/include/qt5/QtGui/qguiapplication.h \ | ||
2152 | - /usr/include/qt5/QtGui/qinputmethod.h \ | ||
2153 | - /usr/include/qt5/QtWidgets/QButtonGroup \ | ||
2154 | - /usr/include/qt5/QtWidgets/qbuttongroup.h \ | ||
2155 | - /usr/include/qt5/QtWidgets/QGridLayout \ | ||
2156 | - /usr/include/qt5/QtWidgets/qgridlayout.h \ | ||
2157 | - /usr/include/qt5/QtWidgets/qlayout.h \ | ||
2158 | - /usr/include/qt5/QtWidgets/qlayoutitem.h \ | ||
2159 | - /usr/include/qt5/QtWidgets/qboxlayout.h \ | ||
2160 | - /usr/include/qt5/QtWidgets/QHeaderView \ | ||
2161 | - /usr/include/qt5/QtWidgets/qheaderview.h \ | ||
2162 | - /usr/include/qt5/QtWidgets/qabstractitemview.h \ | ||
2163 | - /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ | ||
2164 | - /usr/include/qt5/QtWidgets/qframe.h \ | ||
2165 | - /usr/include/qt5/QtCore/qitemselectionmodel.h \ | ||
2166 | - /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ | ||
2167 | - /usr/include/qt5/QtWidgets/qstyleoption.h \ | ||
2168 | - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ | ||
2169 | - /usr/include/qt5/QtGui/qvalidator.h \ | ||
2170 | - /usr/include/qt5/QtWidgets/qslider.h \ | ||
2171 | - /usr/include/qt5/QtWidgets/qabstractslider.h \ | ||
2172 | - /usr/include/qt5/QtWidgets/qstyle.h \ | ||
2173 | - /usr/include/qt5/QtWidgets/qtabbar.h \ | ||
2174 | - /usr/include/qt5/QtWidgets/qrubberband.h \ | ||
2175 | - /usr/include/qt5/QtWidgets/QMenu \ | ||
2176 | - /usr/include/qt5/QtWidgets/qmenu.h \ | ||
2177 | - /usr/include/qt5/QtWidgets/QMenuBar \ | ||
2178 | - /usr/include/qt5/QtWidgets/qmenubar.h \ | ||
2179 | - /usr/include/qt5/QtWidgets/QPushButton \ | ||
2180 | - /usr/include/qt5/QtWidgets/qpushbutton.h \ | ||
2181 | - /usr/include/qt5/QtWidgets/qabstractbutton.h \ | ||
2182 | - /usr/include/qt5/QtWidgets/QSpacerItem \ | ||
2183 | - /usr/include/qt5/QtWidgets/QSplitter \ | ||
2184 | - /usr/include/qt5/QtWidgets/qsplitter.h \ | ||
2185 | - /usr/include/qt5/QtWidgets/QWidget \ | ||
2186 | - ../QChatClient/chatinputtext.h \ | ||
2187 | - /usr/include/qt5/QtWidgets/QTextEdit \ | ||
2188 | - /usr/include/qt5/QtWidgets/qtextedit.h \ | ||
2189 | - /usr/include/qt5/QtGui/qtextdocument.h \ | ||
2190 | - /usr/include/qt5/QtGui/qtextoption.h \ | ||
2191 | - /usr/include/qt5/QtGui/qtextcursor.h \ | ||
2192 | - /usr/include/qt5/QtGui/qtextformat.h \ | ||
2193 | - /usr/include/qt5/QtGui/qpen.h \ | ||
2194 | - /usr/include/qt5/QtGui/QKeyEvent \ | ||
2195 | - ../QChatClient/chatwidget.h \ | ||
2196 | - /usr/include/qt5/QtWidgets/QFileDialog \ | ||
2197 | - /usr/include/qt5/QtWidgets/qfiledialog.h \ | ||
2198 | - /usr/include/qt5/QtCore/qdir.h \ | ||
2199 | - /usr/include/qt5/QtCore/qfileinfo.h \ | ||
2200 | - /usr/include/qt5/QtCore/QFile \ | ||
2201 | - /usr/include/qt5/QtCore/QTextStream | 2037 | + ui_chatwindow.h |
2202 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatwindow.o ../QChatClient/chatwindow.cpp | 2038 | $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatwindow.o ../QChatClient/chatwindow.cpp |
2203 | 2039 | ||
2204 | chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h \ | 2040 | chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h \ |
@@ -2237,7 +2073,6 @@ chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h | @@ -2237,7 +2073,6 @@ chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h | ||
2237 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ | 2073 | /usr/include/qt5/QtCore/qoldbasicatomic.h \ |
2238 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ | 2074 | /usr/include/qt5/QtCore/qatomic_vxworks.h \ |
2239 | /usr/include/qt5/QtCore/qatomic_power.h \ | 2075 | /usr/include/qt5/QtCore/qatomic_power.h \ |
2240 | - /usr/include/qt5/QtCore/qatomic_aarch64.h \ | ||
2241 | /usr/include/qt5/QtCore/qatomic_alpha.h \ | 2076 | /usr/include/qt5/QtCore/qatomic_alpha.h \ |
2242 | /usr/include/qt5/QtCore/qatomic_armv7.h \ | 2077 | /usr/include/qt5/QtCore/qatomic_armv7.h \ |
2243 | /usr/include/qt5/QtCore/qatomic_armv6.h \ | 2078 | /usr/include/qt5/QtCore/qatomic_armv6.h \ |
build-QChatClient-Desktop-Debug/QChatClient
No preview for this file type
build-QChatClient-Desktop-Debug/Socket.o
No preview for this file type
build-QChatClient-Desktop-Debug/chatwidget.o
No preview for this file type
build-QChatClient-Desktop-Debug/chatwindow.o
No preview for this file type
build-QChatClient-Desktop-Debug/loginscreen.o
No preview for this file type
build-QChatClient-Desktop-Debug/main.o
No preview for this file type
build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Meta object code from reading C++ file 'chatinputtext.h' | 2 | ** Meta object code from reading C++ file 'chatinputtext.h' |
3 | ** | 3 | ** |
4 | -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) | 4 | +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost! | 6 | ** WARNING! All changes made in this file will be lost! |
7 | *****************************************************************************/ | 7 | *****************************************************************************/ |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | #if !defined(Q_MOC_OUTPUT_REVISION) | 12 | #if !defined(Q_MOC_OUTPUT_REVISION) |
13 | #error "The header file 'chatinputtext.h' doesn't include <QObject>." | 13 | #error "The header file 'chatinputtext.h' doesn't include <QObject>." |
14 | #elif Q_MOC_OUTPUT_REVISION != 67 | 14 | #elif Q_MOC_OUTPUT_REVISION != 67 |
15 | -#error "This file was generated using the moc from 5.0.2. It" | 15 | +#error "This file was generated using the moc from 5.0.1. It" |
16 | #error "cannot be used with the include files from this version of Qt." | 16 | #error "cannot be used with the include files from this version of Qt." |
17 | #error "(The moc has changed too much.)" | 17 | #error "(The moc has changed too much.)" |
18 | #endif | 18 | #endif |
build-QChatClient-Desktop-Debug/moc_chatroom.cpp
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Meta object code from reading C++ file 'chatroom.h' | 2 | ** Meta object code from reading C++ file 'chatroom.h' |
3 | ** | 3 | ** |
4 | -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) | 4 | +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost! | 6 | ** WARNING! All changes made in this file will be lost! |
7 | *****************************************************************************/ | 7 | *****************************************************************************/ |
@@ -12,15 +12,15 @@ | @@ -12,15 +12,15 @@ | ||
12 | #if !defined(Q_MOC_OUTPUT_REVISION) | 12 | #if !defined(Q_MOC_OUTPUT_REVISION) |
13 | #error "The header file 'chatroom.h' doesn't include <QObject>." | 13 | #error "The header file 'chatroom.h' doesn't include <QObject>." |
14 | #elif Q_MOC_OUTPUT_REVISION != 67 | 14 | #elif Q_MOC_OUTPUT_REVISION != 67 |
15 | -#error "This file was generated using the moc from 5.0.2. It" | 15 | +#error "This file was generated using the moc from 5.0.1. It" |
16 | #error "cannot be used with the include files from this version of Qt." | 16 | #error "cannot be used with the include files from this version of Qt." |
17 | #error "(The moc has changed too much.)" | 17 | #error "(The moc has changed too much.)" |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | QT_BEGIN_MOC_NAMESPACE | 20 | QT_BEGIN_MOC_NAMESPACE |
21 | struct qt_meta_stringdata_Chatroom_t { | 21 | struct qt_meta_stringdata_Chatroom_t { |
22 | - QByteArrayData data[20]; | ||
23 | - char stringdata[244]; | 22 | + QByteArrayData data[23]; |
23 | + char stringdata[277]; | ||
24 | }; | 24 | }; |
25 | #define QT_MOC_LITERAL(idx, ofs, len) \ | 25 | #define QT_MOC_LITERAL(idx, ofs, len) \ |
26 | Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ | 26 | Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ |
@@ -38,25 +38,29 @@ QT_MOC_LITERAL(5, 70, 10), | @@ -38,25 +38,29 @@ QT_MOC_LITERAL(5, 70, 10), | ||
38 | QT_MOC_LITERAL(6, 81, 6), | 38 | QT_MOC_LITERAL(6, 81, 6), |
39 | QT_MOC_LITERAL(7, 88, 15), | 39 | QT_MOC_LITERAL(7, 88, 15), |
40 | QT_MOC_LITERAL(8, 104, 6), | 40 | QT_MOC_LITERAL(8, 104, 6), |
41 | -QT_MOC_LITERAL(9, 111, 12), | ||
42 | -QT_MOC_LITERAL(10, 124, 7), | ||
43 | -QT_MOC_LITERAL(11, 132, 18), | ||
44 | -QT_MOC_LITERAL(12, 151, 16), | ||
45 | -QT_MOC_LITERAL(13, 168, 5), | ||
46 | -QT_MOC_LITERAL(14, 174, 12), | ||
47 | -QT_MOC_LITERAL(15, 187, 8), | ||
48 | -QT_MOC_LITERAL(16, 196, 14), | ||
49 | -QT_MOC_LITERAL(17, 211, 14), | ||
50 | -QT_MOC_LITERAL(18, 226, 7), | ||
51 | -QT_MOC_LITERAL(19, 234, 8) | 41 | +QT_MOC_LITERAL(9, 111, 8), |
42 | +QT_MOC_LITERAL(10, 120, 12), | ||
43 | +QT_MOC_LITERAL(11, 133, 7), | ||
44 | +QT_MOC_LITERAL(12, 141, 18), | ||
45 | +QT_MOC_LITERAL(13, 160, 16), | ||
46 | +QT_MOC_LITERAL(14, 177, 5), | ||
47 | +QT_MOC_LITERAL(15, 183, 12), | ||
48 | +QT_MOC_LITERAL(16, 196, 8), | ||
49 | +QT_MOC_LITERAL(17, 205, 14), | ||
50 | +QT_MOC_LITERAL(18, 220, 14), | ||
51 | +QT_MOC_LITERAL(19, 235, 7), | ||
52 | +QT_MOC_LITERAL(20, 243, 8), | ||
53 | +QT_MOC_LITERAL(21, 252, 14), | ||
54 | +QT_MOC_LITERAL(22, 267, 8) | ||
52 | }, | 55 | }, |
53 | "Chatroom\0messagesToPrint\0\0" | 56 | "Chatroom\0messagesToPrint\0\0" |
54 | "serverMessagesToPrint\0statusMessagesToPrint\0" | 57 | "serverMessagesToPrint\0statusMessagesToPrint\0" |
55 | "createChat\0sender\0toggleConnected\0" | 58 | "createChat\0sender\0toggleConnected\0" |
56 | - "status\0startSession\0sendMsg\0" | 59 | + "status\0newUsers\0startSession\0sendMsg\0" |
57 | "disconnectChatroom\0launchChatWindow\0" | 60 | "disconnectChatroom\0launchChatWindow\0" |
58 | "index\0setConnected\0printMsg\0printServerMsg\0" | 61 | "index\0setConnected\0printMsg\0printServerMsg\0" |
59 | "printStatusMsg\0newChat\0peerNick\0" | 62 | "printStatusMsg\0newChat\0peerNick\0" |
63 | + "updateUserList\0userlist\0" | ||
60 | }; | 64 | }; |
61 | #undef QT_MOC_LITERAL | 65 | #undef QT_MOC_LITERAL |
62 | 66 | ||
@@ -66,30 +70,32 @@ static const uint qt_meta_data_Chatroom[] = { | @@ -66,30 +70,32 @@ static const uint qt_meta_data_Chatroom[] = { | ||
66 | 7, // revision | 70 | 7, // revision |
67 | 0, // classname | 71 | 0, // classname |
68 | 0, 0, // classinfo | 72 | 0, 0, // classinfo |
69 | - 14, 14, // methods | 73 | + 16, 14, // methods |
70 | 0, 0, // properties | 74 | 0, 0, // properties |
71 | 0, 0, // enums/sets | 75 | 0, 0, // enums/sets |
72 | 0, 0, // constructors | 76 | 0, 0, // constructors |
73 | 0, // flags | 77 | 0, // flags |
74 | - 5, // signalCount | 78 | + 6, // signalCount |
75 | 79 | ||
76 | // signals: name, argc, parameters, tag, flags | 80 | // signals: name, argc, parameters, tag, flags |
77 | - 1, 0, 84, 2, 0x05, | ||
78 | - 3, 0, 85, 2, 0x05, | ||
79 | - 4, 0, 86, 2, 0x05, | ||
80 | - 5, 1, 87, 2, 0x05, | ||
81 | - 7, 1, 90, 2, 0x05, | 81 | + 1, 0, 94, 2, 0x05, |
82 | + 3, 0, 95, 2, 0x05, | ||
83 | + 4, 0, 96, 2, 0x05, | ||
84 | + 5, 1, 97, 2, 0x05, | ||
85 | + 7, 1, 100, 2, 0x05, | ||
86 | + 9, 1, 103, 2, 0x05, | ||
82 | 87 | ||
83 | // slots: name, argc, parameters, tag, flags | 88 | // slots: name, argc, parameters, tag, flags |
84 | - 9, 0, 93, 2, 0x0a, | ||
85 | - 10, 0, 94, 2, 0x0a, | ||
86 | - 11, 0, 95, 2, 0x0a, | ||
87 | - 12, 1, 96, 2, 0x0a, | ||
88 | - 14, 1, 99, 2, 0x0a, | ||
89 | - 15, 0, 102, 2, 0x08, | ||
90 | - 16, 0, 103, 2, 0x08, | ||
91 | - 17, 0, 104, 2, 0x08, | ||
92 | - 18, 1, 105, 2, 0x08, | 89 | + 10, 0, 106, 2, 0x0a, |
90 | + 11, 0, 107, 2, 0x0a, | ||
91 | + 12, 0, 108, 2, 0x0a, | ||
92 | + 13, 1, 109, 2, 0x0a, | ||
93 | + 15, 1, 112, 2, 0x0a, | ||
94 | + 16, 0, 115, 2, 0x08, | ||
95 | + 17, 0, 116, 2, 0x08, | ||
96 | + 18, 0, 117, 2, 0x08, | ||
97 | + 19, 1, 118, 2, 0x08, | ||
98 | + 21, 1, 121, 2, 0x08, | ||
93 | 99 | ||
94 | // signals: parameters | 100 | // signals: parameters |
95 | QMetaType::Void, | 101 | QMetaType::Void, |
@@ -97,17 +103,19 @@ static const uint qt_meta_data_Chatroom[] = { | @@ -97,17 +103,19 @@ static const uint qt_meta_data_Chatroom[] = { | ||
97 | QMetaType::Void, | 103 | QMetaType::Void, |
98 | QMetaType::Void, QMetaType::QString, 6, | 104 | QMetaType::Void, QMetaType::QString, 6, |
99 | QMetaType::Void, QMetaType::Bool, 8, | 105 | QMetaType::Void, QMetaType::Bool, 8, |
106 | + QMetaType::Void, QMetaType::QString, 2, | ||
100 | 107 | ||
101 | // slots: parameters | 108 | // slots: parameters |
102 | QMetaType::Void, | 109 | QMetaType::Void, |
103 | QMetaType::Void, | 110 | QMetaType::Void, |
104 | QMetaType::Void, | 111 | QMetaType::Void, |
105 | - QMetaType::Void, QMetaType::QModelIndex, 13, | 112 | + QMetaType::Void, QMetaType::QModelIndex, 14, |
106 | QMetaType::Void, QMetaType::Bool, 8, | 113 | QMetaType::Void, QMetaType::Bool, 8, |
107 | QMetaType::Void, | 114 | QMetaType::Void, |
108 | QMetaType::Void, | 115 | QMetaType::Void, |
109 | QMetaType::Void, | 116 | QMetaType::Void, |
110 | - QMetaType::Void, QMetaType::QString, 19, | 117 | + QMetaType::Void, QMetaType::QString, 20, |
118 | + QMetaType::Void, QMetaType::QString, 22, | ||
111 | 119 | ||
112 | 0 // eod | 120 | 0 // eod |
113 | }; | 121 | }; |
@@ -122,15 +130,17 @@ void Chatroom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo | @@ -122,15 +130,17 @@ void Chatroom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo | ||
122 | case 2: _t->statusMessagesToPrint(); break; | 130 | case 2: _t->statusMessagesToPrint(); break; |
123 | case 3: _t->createChat((*reinterpret_cast< QString(*)>(_a[1]))); break; | 131 | case 3: _t->createChat((*reinterpret_cast< QString(*)>(_a[1]))); break; |
124 | case 4: _t->toggleConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; | 132 | case 4: _t->toggleConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; |
125 | - case 5: _t->startSession(); break; | ||
126 | - case 6: _t->sendMsg(); break; | ||
127 | - case 7: _t->disconnectChatroom(); break; | ||
128 | - case 8: _t->launchChatWindow((*reinterpret_cast< QModelIndex(*)>(_a[1]))); break; | ||
129 | - case 9: _t->setConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; | ||
130 | - case 10: _t->printMsg(); break; | ||
131 | - case 11: _t->printServerMsg(); break; | ||
132 | - case 12: _t->printStatusMsg(); break; | ||
133 | - case 13: _t->newChat((*reinterpret_cast< QString(*)>(_a[1]))); break; | 133 | + case 5: _t->newUsers((*reinterpret_cast< QString(*)>(_a[1]))); break; |
134 | + case 6: _t->startSession(); break; | ||
135 | + case 7: _t->sendMsg(); break; | ||
136 | + case 8: _t->disconnectChatroom(); break; | ||
137 | + case 9: _t->launchChatWindow((*reinterpret_cast< QModelIndex(*)>(_a[1]))); break; | ||
138 | + case 10: _t->setConnected((*reinterpret_cast< bool(*)>(_a[1]))); break; | ||
139 | + case 11: _t->printMsg(); break; | ||
140 | + case 12: _t->printServerMsg(); break; | ||
141 | + case 13: _t->printStatusMsg(); break; | ||
142 | + case 14: _t->newChat((*reinterpret_cast< QString(*)>(_a[1]))); break; | ||
143 | + case 15: _t->updateUserList((*reinterpret_cast< QString(*)>(_a[1]))); break; | ||
134 | default: ; | 144 | default: ; |
135 | } | 145 | } |
136 | } else if (_c == QMetaObject::IndexOfMethod) { | 146 | } else if (_c == QMetaObject::IndexOfMethod) { |
@@ -166,6 +176,12 @@ void Chatroom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo | @@ -166,6 +176,12 @@ void Chatroom::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo | ||
166 | *result = 4; | 176 | *result = 4; |
167 | } | 177 | } |
168 | } | 178 | } |
179 | + { | ||
180 | + typedef void (Chatroom::*_t)(QString ); | ||
181 | + if (*reinterpret_cast<_t *>(func) == static_cast<_t>(&Chatroom::newUsers)) { | ||
182 | + *result = 5; | ||
183 | + } | ||
184 | + } | ||
169 | } | 185 | } |
170 | } | 186 | } |
171 | 187 | ||
@@ -194,13 +210,13 @@ int Chatroom::qt_metacall(QMetaObject::Call _c, int _id, void **_a) | @@ -194,13 +210,13 @@ int Chatroom::qt_metacall(QMetaObject::Call _c, int _id, void **_a) | ||
194 | if (_id < 0) | 210 | if (_id < 0) |
195 | return _id; | 211 | return _id; |
196 | if (_c == QMetaObject::InvokeMetaMethod) { | 212 | if (_c == QMetaObject::InvokeMetaMethod) { |
197 | - if (_id < 14) | 213 | + if (_id < 16) |
198 | qt_static_metacall(this, _c, _id, _a); | 214 | qt_static_metacall(this, _c, _id, _a); |
199 | - _id -= 14; | 215 | + _id -= 16; |
200 | } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { | 216 | } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { |
201 | - if (_id < 14) | 217 | + if (_id < 16) |
202 | *reinterpret_cast<int*>(_a[0]) = -1; | 218 | *reinterpret_cast<int*>(_a[0]) = -1; |
203 | - _id -= 14; | 219 | + _id -= 16; |
204 | } | 220 | } |
205 | return _id; | 221 | return _id; |
206 | } | 222 | } |
@@ -236,4 +252,11 @@ void Chatroom::toggleConnected(bool _t1) | @@ -236,4 +252,11 @@ void Chatroom::toggleConnected(bool _t1) | ||
236 | void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) }; | 252 | void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) }; |
237 | QMetaObject::activate(this, &staticMetaObject, 4, _a); | 253 | QMetaObject::activate(this, &staticMetaObject, 4, _a); |
238 | } | 254 | } |
255 | + | ||
256 | +// SIGNAL 5 | ||
257 | +void Chatroom::newUsers(QString _t1) | ||
258 | +{ | ||
259 | + void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) }; | ||
260 | + QMetaObject::activate(this, &staticMetaObject, 5, _a); | ||
261 | +} | ||
239 | QT_END_MOC_NAMESPACE | 262 | QT_END_MOC_NAMESPACE |
build-QChatClient-Desktop-Debug/moc_chatroom.o
No preview for this file type
build-QChatClient-Desktop-Debug/moc_chatwidget.cpp
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Meta object code from reading C++ file 'chatwidget.h' | 2 | ** Meta object code from reading C++ file 'chatwidget.h' |
3 | ** | 3 | ** |
4 | -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) | 4 | +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost! | 6 | ** WARNING! All changes made in this file will be lost! |
7 | *****************************************************************************/ | 7 | *****************************************************************************/ |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | #if !defined(Q_MOC_OUTPUT_REVISION) | 12 | #if !defined(Q_MOC_OUTPUT_REVISION) |
13 | #error "The header file 'chatwidget.h' doesn't include <QObject>." | 13 | #error "The header file 'chatwidget.h' doesn't include <QObject>." |
14 | #elif Q_MOC_OUTPUT_REVISION != 67 | 14 | #elif Q_MOC_OUTPUT_REVISION != 67 |
15 | -#error "This file was generated using the moc from 5.0.2. It" | 15 | +#error "This file was generated using the moc from 5.0.1. It" |
16 | #error "cannot be used with the include files from this version of Qt." | 16 | #error "cannot be used with the include files from this version of Qt." |
17 | #error "(The moc has changed too much.)" | 17 | #error "(The moc has changed too much.)" |
18 | #endif | 18 | #endif |
build-QChatClient-Desktop-Debug/moc_chatwidget.o
No preview for this file type
build-QChatClient-Desktop-Debug/moc_chatwindow.cpp
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Meta object code from reading C++ file 'chatwindow.h' | 2 | ** Meta object code from reading C++ file 'chatwindow.h' |
3 | ** | 3 | ** |
4 | -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) | 4 | +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost! | 6 | ** WARNING! All changes made in this file will be lost! |
7 | *****************************************************************************/ | 7 | *****************************************************************************/ |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | #if !defined(Q_MOC_OUTPUT_REVISION) | 12 | #if !defined(Q_MOC_OUTPUT_REVISION) |
13 | #error "The header file 'chatwindow.h' doesn't include <QObject>." | 13 | #error "The header file 'chatwindow.h' doesn't include <QObject>." |
14 | #elif Q_MOC_OUTPUT_REVISION != 67 | 14 | #elif Q_MOC_OUTPUT_REVISION != 67 |
15 | -#error "This file was generated using the moc from 5.0.2. It" | 15 | +#error "This file was generated using the moc from 5.0.1. It" |
16 | #error "cannot be used with the include files from this version of Qt." | 16 | #error "cannot be used with the include files from this version of Qt." |
17 | #error "(The moc has changed too much.)" | 17 | #error "(The moc has changed too much.)" |
18 | #endif | 18 | #endif |
build-QChatClient-Desktop-Debug/moc_chatwindow.o
No preview for this file type
build-QChatClient-Desktop-Debug/moc_loginscreen.cpp
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Meta object code from reading C++ file 'loginscreen.h' | 2 | ** Meta object code from reading C++ file 'loginscreen.h' |
3 | ** | 3 | ** |
4 | -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) | 4 | +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost! | 6 | ** WARNING! All changes made in this file will be lost! |
7 | *****************************************************************************/ | 7 | *****************************************************************************/ |
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | #if !defined(Q_MOC_OUTPUT_REVISION) | 12 | #if !defined(Q_MOC_OUTPUT_REVISION) |
13 | #error "The header file 'loginscreen.h' doesn't include <QObject>." | 13 | #error "The header file 'loginscreen.h' doesn't include <QObject>." |
14 | #elif Q_MOC_OUTPUT_REVISION != 67 | 14 | #elif Q_MOC_OUTPUT_REVISION != 67 |
15 | -#error "This file was generated using the moc from 5.0.2. It" | 15 | +#error "This file was generated using the moc from 5.0.1. It" |
16 | #error "cannot be used with the include files from this version of Qt." | 16 | #error "cannot be used with the include files from this version of Qt." |
17 | #error "(The moc has changed too much.)" | 17 | #error "(The moc has changed too much.)" |
18 | #endif | 18 | #endif |
build-QChatClient-Desktop-Debug/moc_loginscreen.o
No preview for this file type
build-QChatClient-Desktop-Debug/ui_chatroom.h
1 | /******************************************************************************** | 1 | /******************************************************************************** |
2 | ** Form generated from reading UI file 'chatroom.ui' | 2 | ** Form generated from reading UI file 'chatroom.ui' |
3 | ** | 3 | ** |
4 | -** Created by: Qt User Interface Compiler version 5.0.2 | 4 | +** Created by: Qt User Interface Compiler version 5.0.1 |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost when recompiling UI file! | 6 | ** WARNING! All changes made in this file will be lost when recompiling UI file! |
7 | ********************************************************************************/ | 7 | ********************************************************************************/ |
build-QChatClient-Desktop-Debug/ui_chatwindow.h
1 | /******************************************************************************** | 1 | /******************************************************************************** |
2 | ** Form generated from reading UI file 'chatwindow.ui' | 2 | ** Form generated from reading UI file 'chatwindow.ui' |
3 | ** | 3 | ** |
4 | -** Created by: Qt User Interface Compiler version 5.0.2 | 4 | +** Created by: Qt User Interface Compiler version 5.0.1 |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost when recompiling UI file! | 6 | ** WARNING! All changes made in this file will be lost when recompiling UI file! |
7 | ********************************************************************************/ | 7 | ********************************************************************************/ |
build-QChatClient-Desktop-Debug/ui_loginscreen.h
1 | /******************************************************************************** | 1 | /******************************************************************************** |
2 | ** Form generated from reading UI file 'loginscreen.ui' | 2 | ** Form generated from reading UI file 'loginscreen.ui' |
3 | ** | 3 | ** |
4 | -** Created by: Qt User Interface Compiler version 5.0.2 | 4 | +** Created by: Qt User Interface Compiler version 5.0.1 |
5 | ** | 5 | ** |
6 | ** WARNING! All changes made in this file will be lost when recompiling UI file! | 6 | ** WARNING! All changes made in this file will be lost when recompiling UI file! |
7 | ********************************************************************************/ | 7 | ********************************************************************************/ |