From ca6801463d0acd4cd9759dbcb0b6e22f9775392c Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Tue, 7 Jan 2014 06:18:07 +0000 Subject: [PATCH] git-svn-id: svn://imanolbarba.net/PAD@54 c2ee353e-ed0d-4329-bf56-03aec153487f --- QChatClient/chatroom.cpp | 4 +++- build-QChatClient-Desktop-Debug/Makefile | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------- build-QChatClient-Desktop-Debug/QChatClient | Bin 2146250 -> 0 bytes build-QChatClient-Desktop-Debug/Socket.o | Bin 64776 -> 0 bytes build-QChatClient-Desktop-Debug/chatwidget.o | Bin 216884 -> 0 bytes build-QChatClient-Desktop-Debug/chatwindow.o | Bin 451188 -> 0 bytes build-QChatClient-Desktop-Debug/loginscreen.o | Bin 407284 -> 0 bytes build-QChatClient-Desktop-Debug/main.o | Bin 174448 -> 0 bytes build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatroom.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatroom.o | Bin 328080 -> 0 bytes build-QChatClient-Desktop-Debug/moc_chatwidget.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatwidget.o | Bin 419720 -> 0 bytes build-QChatClient-Desktop-Debug/moc_chatwindow.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_chatwindow.o | Bin 215120 -> 0 bytes build-QChatClient-Desktop-Debug/moc_loginscreen.cpp | 4 ++-- build-QChatClient-Desktop-Debug/moc_loginscreen.o | Bin 205900 -> 0 bytes build-QChatClient-Desktop-Debug/ui_chatroom.h | 2 +- build-QChatClient-Desktop-Debug/ui_chatwindow.h | 2 +- build-QChatClient-Desktop-Debug/ui_loginscreen.h | 2 +- 20 files changed, 237 insertions(+), 52 deletions(-) diff --git a/QChatClient/chatroom.cpp b/QChatClient/chatroom.cpp index 66e54e5..02cf51f 100644 --- a/QChatClient/chatroom.cpp +++ b/QChatClient/chatroom.cpp @@ -234,15 +234,17 @@ void Chatroom::relayMsg(string msg) void Chatroom::newChat(QString peerNick) { cout << "add chat" << endl; - freeChats(false); + chatMutex.lock(); ChatWindow* newchat = new ChatWindow(peerNick,this); activeChats.insert(std::pair(peerNick.toStdString(),newchat)); newchat->show(); + chatMutex.unlock(); chatCreated.notify_all(); } void Chatroom::removeChat(QString &nickname) { + freeChats(false); cout << "move to inactive" << endl; chatMutex.lock(); ChatWindow* chat = (ChatWindow*) activeChats.find(nickname.toStdString())->second; diff --git a/build-QChatClient-Desktop-Debug/Makefile b/build-QChatClient-Desktop-Debug/Makefile index 9e5c122..a173045 100644 --- a/build-QChatClient-Desktop-Debug/Makefile +++ b/build-QChatClient-Desktop-Debug/Makefile @@ -1,9 +1,9 @@ ############################################################################# # Makefile for building: QChatClient -# Generated by qmake (3.0) (Qt 5.0.1) on: mar ene 7 05:02:24 2014 +# Generated by qmake (3.0) (Qt 5.0.2) on: mar ene 7 06:18:50 2014 # Project: ../QChatClient/QChatClient.pro # Template: app -# 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 +# 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 ############################################################################# MAKEFILE = Makefile @@ -13,15 +13,15 @@ MAKEFILE = Makefile CC = gcc CXX = g++ DEFINES = -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) -CXXFLAGS = -pipe -std=c++11 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) -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. +CFLAGS = -m64 -pipe -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) +CXXFLAGS = -m64 -pipe -std=c++11 -g -Wall -W -D_REENTRANT -fPIE $(DEFINES) +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. LINK = g++ -LFLAGS = -LIBS = $(SUBLIBS) -lQt5Widgets -L/usr/lib/i386-linux-gnu -lQt5Gui -lQt5Core -lGL -lpthread +LFLAGS = -m64 +LIBS = $(SUBLIBS) -L/usr/X11R6/lib64 -lQt5Widgets -L/usr/lib/x86_64-linux-gnu -lQt5Gui -lQt5Core -lGL -lpthread AR = ar cqs RANLIB = -QMAKE = /usr/lib/i386-linux-gnu/qt5/bin/qmake +QMAKE = /usr/lib/x86_64-linux-gnu/qt5/bin/qmake TAR = tar -cf COMPRESS = gzip -9f COPY = cp -f @@ -93,18 +93,18 @@ DIST = /usr/share/qt5/mkspecs/features/spec_pre.prf \ /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_v8.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ /usr/share/qt5/mkspecs/features/qt_functions.prf \ /usr/share/qt5/mkspecs/features/qt_config.prf \ - /usr/share/qt5/mkspecs/linux-g++/qmake.conf \ + /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf \ /usr/share/qt5/mkspecs/features/spec_post.prf \ /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ /usr/share/qt5/mkspecs/features/default_pre.prf \ /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ - /usr/share/qt5/mkspecs/features/debug.prf \ + /usr/share/qt5/mkspecs/features/resolve_config.prf \ /usr/share/qt5/mkspecs/features/default_post.prf \ - /usr/share/qt5/mkspecs/features/shared.prf \ /usr/share/qt5/mkspecs/features/qml_debug.prf \ /usr/share/qt5/mkspecs/features/declarative_debug.prf \ /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ @@ -155,7 +155,7 @@ $(TARGET): ui_chatwindow.h ui_loginscreen.h ui_chatroom.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) { 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 -Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake.conf /usr/share/qt5/mkspecs/features/spec_pre.prf \ +Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf /usr/share/qt5/mkspecs/features/spec_pre.prf \ /usr/share/qt5/mkspecs/common/shell-unix.conf \ /usr/share/qt5/mkspecs/common/unix.conf \ /usr/share/qt5/mkspecs/common/linux.conf \ @@ -180,18 +180,18 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake. /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri \ + /usr/share/qt5/mkspecs/modules/qt_lib_v8.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri \ /usr/share/qt5/mkspecs/features/qt_functions.prf \ /usr/share/qt5/mkspecs/features/qt_config.prf \ - /usr/share/qt5/mkspecs/linux-g++/qmake.conf \ + /usr/share/qt5/mkspecs/linux-g++-64/qmake.conf \ /usr/share/qt5/mkspecs/features/spec_post.prf \ /usr/share/qt5/mkspecs/features/exclusive_builds.prf \ /usr/share/qt5/mkspecs/features/default_pre.prf \ /usr/share/qt5/mkspecs/features/unix/default_pre.prf \ - /usr/share/qt5/mkspecs/features/debug.prf \ + /usr/share/qt5/mkspecs/features/resolve_config.prf \ /usr/share/qt5/mkspecs/features/default_post.prf \ - /usr/share/qt5/mkspecs/features/shared.prf \ /usr/share/qt5/mkspecs/features/qml_debug.prf \ /usr/share/qt5/mkspecs/features/declarative_debug.prf \ /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf \ @@ -208,10 +208,10 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake. /usr/share/qt5/mkspecs/features/yacc.prf \ /usr/share/qt5/mkspecs/features/lex.prf \ ../QChatClient/QChatClient.pro \ - /usr/lib/i386-linux-gnu/libQt5Widgets.prl \ - /usr/lib/i386-linux-gnu/libQt5Gui.prl \ - /usr/lib/i386-linux-gnu/libQt5Core.prl - $(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro + /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Core.prl + $(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/features/spec_pre.prf: /usr/share/qt5/mkspecs/common/shell-unix.conf: /usr/share/qt5/mkspecs/common/unix.conf: @@ -237,18 +237,18 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake. /usr/share/qt5/mkspecs/modules/qt_lib_quickparticles.pri: /usr/share/qt5/mkspecs/modules/qt_lib_sql.pri: /usr/share/qt5/mkspecs/modules/qt_lib_testlib.pri: +/usr/share/qt5/mkspecs/modules/qt_lib_v8.pri: /usr/share/qt5/mkspecs/modules/qt_lib_widgets.pri: /usr/share/qt5/mkspecs/modules/qt_lib_xml.pri: /usr/share/qt5/mkspecs/features/qt_functions.prf: /usr/share/qt5/mkspecs/features/qt_config.prf: -/usr/share/qt5/mkspecs/linux-g++/qmake.conf: +/usr/share/qt5/mkspecs/linux-g++-64/qmake.conf: /usr/share/qt5/mkspecs/features/spec_post.prf: /usr/share/qt5/mkspecs/features/exclusive_builds.prf: /usr/share/qt5/mkspecs/features/default_pre.prf: /usr/share/qt5/mkspecs/features/unix/default_pre.prf: -/usr/share/qt5/mkspecs/features/debug.prf: +/usr/share/qt5/mkspecs/features/resolve_config.prf: /usr/share/qt5/mkspecs/features/default_post.prf: -/usr/share/qt5/mkspecs/features/shared.prf: /usr/share/qt5/mkspecs/features/qml_debug.prf: /usr/share/qt5/mkspecs/features/declarative_debug.prf: /usr/share/qt5/mkspecs/features/unix/gdb_dwarf_index.prf: @@ -265,16 +265,16 @@ Makefile: ../QChatClient/QChatClient.pro /usr/share/qt5/mkspecs/linux-g++/qmake. /usr/share/qt5/mkspecs/features/yacc.prf: /usr/share/qt5/mkspecs/features/lex.prf: ../QChatClient/QChatClient.pro: -/usr/lib/i386-linux-gnu/libQt5Widgets.prl: -/usr/lib/i386-linux-gnu/libQt5Gui.prl: -/usr/lib/i386-linux-gnu/libQt5Core.prl: +/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl: +/usr/lib/x86_64-linux-gnu/libQt5Gui.prl: +/usr/lib/x86_64-linux-gnu/libQt5Core.prl: qmake: FORCE - @$(QMAKE) -spec linux-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro + @$(QMAKE) -spec linux-g++-64 CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile ../QChatClient/QChatClient.pro qmake_all: FORCE dist: - @test -d .tmp/QChatClient1.0.0 || $(MKDIR) .tmp/QChatClient1.0.0 + @test -d .tmp/QChatClient1.0.0 || mkdir -p .tmp/QChatClient1.0.0 $(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 @@ -338,6 +338,7 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -425,7 +426,7 @@ moc_loginscreen.cpp: /usr/include/qt5/QtWidgets/QDialog \ ../QChatClient/SocketException.h \ ../QChatClient/chatwindow.h \ ../QChatClient/loginscreen.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/loginscreen.h -o moc_loginscreen.cpp + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/loginscreen.h -o moc_loginscreen.cpp moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtWidgets/qmainwindow.h \ @@ -460,6 +461,7 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -547,7 +549,7 @@ moc_chatroom.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ ../QChatClient/chatroom.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatroom.h -o moc_chatroom.cpp + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatroom.h -o moc_chatroom.cpp moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtWidgets/qtextedit.h \ @@ -584,6 +586,7 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -671,7 +674,7 @@ moc_chatwidget.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtCore/QFile \ /usr/include/qt5/QtCore/QTextStream \ ../QChatClient/chatwidget.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwidget.h -o moc_chatwidget.cpp + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwidget.h -o moc_chatwidget.cpp moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtWidgets/qmainwindow.h \ @@ -706,6 +709,7 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -793,7 +797,7 @@ moc_chatwindow.cpp: /usr/include/qt5/QtWidgets/QMainWindow \ ../QChatClient/SocketException.h \ ../QChatClient/chatwindow.h \ ../QChatClient/chatwindow.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwindow.h -o moc_chatwindow.cpp + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatwindow.h -o moc_chatwindow.cpp moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtWidgets/qtextedit.h \ @@ -830,6 +834,7 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -911,7 +916,7 @@ moc_chatinputtext.cpp: /usr/include/qt5/QtWidgets/QTextEdit \ /usr/include/qt5/QtGui/qpen.h \ /usr/include/qt5/QtGui/QKeyEvent \ ../QChatClient/chatinputtext.h - /usr/lib/i386-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatinputtext.h -o moc_chatinputtext.cpp + /usr/lib/x86_64-linux-gnu/qt5/bin/moc $(DEFINES) $(INCPATH) ../QChatClient/chatinputtext.h -o moc_chatinputtext.cpp compiler_wayland-code_make_all: compiler_wayland-code_clean: @@ -958,6 +963,7 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1079,6 +1085,7 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1159,10 +1166,10 @@ ui_chatwindow.h: ../QChatClient/chatwindow.ui \ /usr/include/qt5/QtGui/qtextformat.h \ /usr/include/qt5/QtGui/qpen.h \ /usr/include/qt5/QtGui/QKeyEvent - /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/chatwindow.ui -o ui_chatwindow.h + /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/chatwindow.ui -o ui_chatwindow.h ui_loginscreen.h: ../QChatClient/loginscreen.ui - /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/loginscreen.ui -o ui_loginscreen.h + /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/loginscreen.ui -o ui_loginscreen.h ui_chatroom.h: ../QChatClient/chatroom.ui \ ../QChatClient/chatwidget.h \ @@ -1202,6 +1209,7 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1323,6 +1331,7 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1403,7 +1412,7 @@ ui_chatroom.h: ../QChatClient/chatroom.ui \ /usr/include/qt5/QtGui/qtextformat.h \ /usr/include/qt5/QtGui/qpen.h \ /usr/include/qt5/QtGui/QKeyEvent - /usr/lib/i386-linux-gnu/qt5/bin/uic ../QChatClient/chatroom.ui -o ui_chatroom.h + /usr/lib/x86_64-linux-gnu/qt5/bin/uic ../QChatClient/chatroom.ui -o ui_chatroom.h compiler_yacc_decl_make_all: compiler_yacc_decl_clean: @@ -1449,6 +1458,7 @@ main.o: ../QChatClient/main.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1577,6 +1587,7 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1662,7 +1673,53 @@ loginscreen.o: ../QChatClient/loginscreen.cpp ../QChatClient/loginscreen.h \ ../QChatClient/chatwindow.h \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ - ui_loginscreen.h + ui_loginscreen.h \ + /usr/include/qt5/QtCore/QVariant \ + /usr/include/qt5/QtWidgets/QAction \ + /usr/include/qt5/QtWidgets/qaction.h \ + /usr/include/qt5/QtWidgets/qactiongroup.h \ + /usr/include/qt5/QtWidgets/QApplication \ + /usr/include/qt5/QtWidgets/qapplication.h \ + /usr/include/qt5/QtCore/qcoreapplication.h \ + /usr/include/qt5/QtCore/qeventloop.h \ + /usr/include/qt5/QtWidgets/qdesktopwidget.h \ + /usr/include/qt5/QtGui/qguiapplication.h \ + /usr/include/qt5/QtGui/qinputmethod.h \ + /usr/include/qt5/QtWidgets/QButtonGroup \ + /usr/include/qt5/QtWidgets/qbuttongroup.h \ + /usr/include/qt5/QtWidgets/QGridLayout \ + /usr/include/qt5/QtWidgets/qgridlayout.h \ + /usr/include/qt5/QtWidgets/qlayout.h \ + /usr/include/qt5/QtWidgets/qlayoutitem.h \ + /usr/include/qt5/QtWidgets/qboxlayout.h \ + /usr/include/qt5/QtWidgets/QHeaderView \ + /usr/include/qt5/QtWidgets/qheaderview.h \ + /usr/include/qt5/QtWidgets/qabstractitemview.h \ + /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ + /usr/include/qt5/QtWidgets/qframe.h \ + /usr/include/qt5/QtCore/qitemselectionmodel.h \ + /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ + /usr/include/qt5/QtWidgets/qstyleoption.h \ + /usr/include/qt5/QtWidgets/qabstractspinbox.h \ + /usr/include/qt5/QtGui/qvalidator.h \ + /usr/include/qt5/QtWidgets/qslider.h \ + /usr/include/qt5/QtWidgets/qabstractslider.h \ + /usr/include/qt5/QtWidgets/qstyle.h \ + /usr/include/qt5/QtWidgets/qtabbar.h \ + /usr/include/qt5/QtWidgets/qrubberband.h \ + /usr/include/qt5/QtWidgets/QLabel \ + /usr/include/qt5/QtWidgets/qlabel.h \ + /usr/include/qt5/QtWidgets/QLineEdit \ + /usr/include/qt5/QtWidgets/qlineedit.h \ + /usr/include/qt5/QtGui/qtextcursor.h \ + /usr/include/qt5/QtGui/qtextformat.h \ + /usr/include/qt5/QtGui/qpen.h \ + /usr/include/qt5/QtGui/qtextoption.h \ + /usr/include/qt5/QtWidgets/QPushButton \ + /usr/include/qt5/QtWidgets/qpushbutton.h \ + /usr/include/qt5/QtWidgets/qabstractbutton.h \ + /usr/include/qt5/QtWidgets/QSpacerItem \ + /usr/include/qt5/QtWidgets/QWidget $(CXX) -c $(CXXFLAGS) $(INCPATH) -o loginscreen.o ../QChatClient/loginscreen.cpp chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ @@ -1699,6 +1756,7 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1784,7 +1842,69 @@ chatroom.o: ../QChatClient/chatroom.cpp ../QChatClient/chatroom.h \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ ../QChatClient/chatwindow.h \ - ui_chatroom.h + ui_chatroom.h \ + /usr/include/qt5/QtCore/QVariant \ + /usr/include/qt5/QtWidgets/QAction \ + /usr/include/qt5/QtWidgets/qaction.h \ + /usr/include/qt5/QtWidgets/qactiongroup.h \ + /usr/include/qt5/QtWidgets/QApplication \ + /usr/include/qt5/QtWidgets/qapplication.h \ + /usr/include/qt5/QtCore/qcoreapplication.h \ + /usr/include/qt5/QtCore/qeventloop.h \ + /usr/include/qt5/QtWidgets/qdesktopwidget.h \ + /usr/include/qt5/QtGui/qguiapplication.h \ + /usr/include/qt5/QtGui/qinputmethod.h \ + /usr/include/qt5/QtWidgets/QButtonGroup \ + /usr/include/qt5/QtWidgets/qbuttongroup.h \ + /usr/include/qt5/QtWidgets/QGridLayout \ + /usr/include/qt5/QtWidgets/qgridlayout.h \ + /usr/include/qt5/QtWidgets/qlayout.h \ + /usr/include/qt5/QtWidgets/qlayoutitem.h \ + /usr/include/qt5/QtWidgets/qboxlayout.h \ + /usr/include/qt5/QtWidgets/QHeaderView \ + /usr/include/qt5/QtWidgets/qheaderview.h \ + /usr/include/qt5/QtWidgets/qabstractitemview.h \ + /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ + /usr/include/qt5/QtWidgets/qframe.h \ + /usr/include/qt5/QtCore/qitemselectionmodel.h \ + /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ + /usr/include/qt5/QtWidgets/qstyleoption.h \ + /usr/include/qt5/QtWidgets/qabstractspinbox.h \ + /usr/include/qt5/QtGui/qvalidator.h \ + /usr/include/qt5/QtWidgets/qslider.h \ + /usr/include/qt5/QtWidgets/qabstractslider.h \ + /usr/include/qt5/QtWidgets/qstyle.h \ + /usr/include/qt5/QtWidgets/qtabbar.h \ + /usr/include/qt5/QtWidgets/qrubberband.h \ + /usr/include/qt5/QtWidgets/QListWidget \ + /usr/include/qt5/QtWidgets/qlistwidget.h \ + /usr/include/qt5/QtWidgets/qlistview.h \ + /usr/include/qt5/QtWidgets/QMenu \ + /usr/include/qt5/QtWidgets/qmenu.h \ + /usr/include/qt5/QtWidgets/QMenuBar \ + /usr/include/qt5/QtWidgets/qmenubar.h \ + /usr/include/qt5/QtWidgets/QPushButton \ + /usr/include/qt5/QtWidgets/qpushbutton.h \ + /usr/include/qt5/QtWidgets/qabstractbutton.h \ + /usr/include/qt5/QtWidgets/QSplitter \ + /usr/include/qt5/QtWidgets/qsplitter.h \ + /usr/include/qt5/QtWidgets/QWidget \ + ../QChatClient/chatinputtext.h \ + /usr/include/qt5/QtWidgets/QTextEdit \ + /usr/include/qt5/QtWidgets/qtextedit.h \ + /usr/include/qt5/QtGui/qtextdocument.h \ + /usr/include/qt5/QtGui/qtextoption.h \ + /usr/include/qt5/QtGui/qtextcursor.h \ + /usr/include/qt5/QtGui/qtextformat.h \ + /usr/include/qt5/QtGui/qpen.h \ + /usr/include/qt5/QtGui/QKeyEvent \ + ../QChatClient/chatwidget.h \ + /usr/include/qt5/QtWidgets/QFileDialog \ + /usr/include/qt5/QtWidgets/qfiledialog.h \ + /usr/include/qt5/QtCore/qdir.h \ + /usr/include/qt5/QtCore/qfileinfo.h \ + /usr/include/qt5/QtCore/QFile \ + /usr/include/qt5/QtCore/QTextStream $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatroom.o ../QChatClient/chatroom.cpp Socket.o: ../QChatClient/Socket.cpp ../QChatClient/Socket.h \ @@ -1827,6 +1947,7 @@ chatwidget.o: ../QChatClient/chatwidget.cpp ../QChatClient/chatwidget.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -1949,6 +2070,7 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ @@ -2034,7 +2156,67 @@ chatwindow.o: ../QChatClient/chatwindow.cpp ../QChatClient/chatwindow.h \ /usr/include/qt5/QtCore/QRegExp \ ../QChatClient/Socket.h \ ../QChatClient/SocketException.h \ - ui_chatwindow.h + ui_chatwindow.h \ + /usr/include/qt5/QtCore/QVariant \ + /usr/include/qt5/QtWidgets/QAction \ + /usr/include/qt5/QtWidgets/qaction.h \ + /usr/include/qt5/QtWidgets/qactiongroup.h \ + /usr/include/qt5/QtWidgets/QApplication \ + /usr/include/qt5/QtWidgets/qapplication.h \ + /usr/include/qt5/QtCore/qcoreapplication.h \ + /usr/include/qt5/QtCore/qeventloop.h \ + /usr/include/qt5/QtWidgets/qdesktopwidget.h \ + /usr/include/qt5/QtGui/qguiapplication.h \ + /usr/include/qt5/QtGui/qinputmethod.h \ + /usr/include/qt5/QtWidgets/QButtonGroup \ + /usr/include/qt5/QtWidgets/qbuttongroup.h \ + /usr/include/qt5/QtWidgets/QGridLayout \ + /usr/include/qt5/QtWidgets/qgridlayout.h \ + /usr/include/qt5/QtWidgets/qlayout.h \ + /usr/include/qt5/QtWidgets/qlayoutitem.h \ + /usr/include/qt5/QtWidgets/qboxlayout.h \ + /usr/include/qt5/QtWidgets/QHeaderView \ + /usr/include/qt5/QtWidgets/qheaderview.h \ + /usr/include/qt5/QtWidgets/qabstractitemview.h \ + /usr/include/qt5/QtWidgets/qabstractscrollarea.h \ + /usr/include/qt5/QtWidgets/qframe.h \ + /usr/include/qt5/QtCore/qitemselectionmodel.h \ + /usr/include/qt5/QtWidgets/qabstractitemdelegate.h \ + /usr/include/qt5/QtWidgets/qstyleoption.h \ + /usr/include/qt5/QtWidgets/qabstractspinbox.h \ + /usr/include/qt5/QtGui/qvalidator.h \ + /usr/include/qt5/QtWidgets/qslider.h \ + /usr/include/qt5/QtWidgets/qabstractslider.h \ + /usr/include/qt5/QtWidgets/qstyle.h \ + /usr/include/qt5/QtWidgets/qtabbar.h \ + /usr/include/qt5/QtWidgets/qrubberband.h \ + /usr/include/qt5/QtWidgets/QMenu \ + /usr/include/qt5/QtWidgets/qmenu.h \ + /usr/include/qt5/QtWidgets/QMenuBar \ + /usr/include/qt5/QtWidgets/qmenubar.h \ + /usr/include/qt5/QtWidgets/QPushButton \ + /usr/include/qt5/QtWidgets/qpushbutton.h \ + /usr/include/qt5/QtWidgets/qabstractbutton.h \ + /usr/include/qt5/QtWidgets/QSpacerItem \ + /usr/include/qt5/QtWidgets/QSplitter \ + /usr/include/qt5/QtWidgets/qsplitter.h \ + /usr/include/qt5/QtWidgets/QWidget \ + ../QChatClient/chatinputtext.h \ + /usr/include/qt5/QtWidgets/QTextEdit \ + /usr/include/qt5/QtWidgets/qtextedit.h \ + /usr/include/qt5/QtGui/qtextdocument.h \ + /usr/include/qt5/QtGui/qtextoption.h \ + /usr/include/qt5/QtGui/qtextcursor.h \ + /usr/include/qt5/QtGui/qtextformat.h \ + /usr/include/qt5/QtGui/qpen.h \ + /usr/include/qt5/QtGui/QKeyEvent \ + ../QChatClient/chatwidget.h \ + /usr/include/qt5/QtWidgets/QFileDialog \ + /usr/include/qt5/QtWidgets/qfiledialog.h \ + /usr/include/qt5/QtCore/qdir.h \ + /usr/include/qt5/QtCore/qfileinfo.h \ + /usr/include/qt5/QtCore/QFile \ + /usr/include/qt5/QtCore/QTextStream $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chatwindow.o ../QChatClient/chatwindow.cpp chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h \ @@ -2073,6 +2255,7 @@ chatinputtext.o: ../QChatClient/chatinputtext.cpp ../QChatClient/chatinputtext.h /usr/include/qt5/QtCore/qoldbasicatomic.h \ /usr/include/qt5/QtCore/qatomic_vxworks.h \ /usr/include/qt5/QtCore/qatomic_power.h \ + /usr/include/qt5/QtCore/qatomic_aarch64.h \ /usr/include/qt5/QtCore/qatomic_alpha.h \ /usr/include/qt5/QtCore/qatomic_armv7.h \ /usr/include/qt5/QtCore/qatomic_armv6.h \ diff --git a/build-QChatClient-Desktop-Debug/QChatClient b/build-QChatClient-Desktop-Debug/QChatClient index 2f22f53..988cb07 100755 Binary files a/build-QChatClient-Desktop-Debug/QChatClient and b/build-QChatClient-Desktop-Debug/QChatClient differ diff --git a/build-QChatClient-Desktop-Debug/Socket.o b/build-QChatClient-Desktop-Debug/Socket.o index 143e0cd..b28990b 100644 Binary files a/build-QChatClient-Desktop-Debug/Socket.o and b/build-QChatClient-Desktop-Debug/Socket.o differ diff --git a/build-QChatClient-Desktop-Debug/chatwidget.o b/build-QChatClient-Desktop-Debug/chatwidget.o index b12c5de..9d12ee2 100644 Binary files a/build-QChatClient-Desktop-Debug/chatwidget.o and b/build-QChatClient-Desktop-Debug/chatwidget.o differ diff --git a/build-QChatClient-Desktop-Debug/chatwindow.o b/build-QChatClient-Desktop-Debug/chatwindow.o index e09ca6d..e328c9d 100644 Binary files a/build-QChatClient-Desktop-Debug/chatwindow.o and b/build-QChatClient-Desktop-Debug/chatwindow.o differ diff --git a/build-QChatClient-Desktop-Debug/loginscreen.o b/build-QChatClient-Desktop-Debug/loginscreen.o index d355b79..50995e9 100644 Binary files a/build-QChatClient-Desktop-Debug/loginscreen.o and b/build-QChatClient-Desktop-Debug/loginscreen.o differ diff --git a/build-QChatClient-Desktop-Debug/main.o b/build-QChatClient-Desktop-Debug/main.o index 63e0e74..bcbfd00 100644 Binary files a/build-QChatClient-Desktop-Debug/main.o and b/build-QChatClient-Desktop-Debug/main.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp b/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp index c256b92..1016adf 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatinputtext.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatinputtext.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatinputtext.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.1. It" +#error "This file was generated using the moc from 5.0.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatroom.cpp b/build-QChatClient-Desktop-Debug/moc_chatroom.cpp index 6471da8..49d3a60 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatroom.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatroom.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatroom.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatroom.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.1. It" +#error "This file was generated using the moc from 5.0.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatroom.o b/build-QChatClient-Desktop-Debug/moc_chatroom.o index d4de34c..828e896 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_chatroom.o and b/build-QChatClient-Desktop-Debug/moc_chatroom.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp b/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp index 2512a0a..d5554eb 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatwidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatwidget.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatwidget.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.1. It" +#error "This file was generated using the moc from 5.0.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatwidget.o b/build-QChatClient-Desktop-Debug/moc_chatwidget.o index 41c6889..ef99011 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_chatwidget.o and b/build-QChatClient-Desktop-Debug/moc_chatwidget.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp b/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp index 456d9d8..baa355a 100644 --- a/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp +++ b/build-QChatClient-Desktop-Debug/moc_chatwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'chatwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'chatwindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.1. It" +#error "This file was generated using the moc from 5.0.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_chatwindow.o b/build-QChatClient-Desktop-Debug/moc_chatwindow.o index 4eb3632..68fc9e7 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_chatwindow.o and b/build-QChatClient-Desktop-Debug/moc_chatwindow.o differ diff --git a/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp b/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp index f8856b4..d449b2f 100644 --- a/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp +++ b/build-QChatClient-Desktop-Debug/moc_loginscreen.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'loginscreen.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.0.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'loginscreen.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.0.1. It" +#error "This file was generated using the moc from 5.0.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/build-QChatClient-Desktop-Debug/moc_loginscreen.o b/build-QChatClient-Desktop-Debug/moc_loginscreen.o index db060d6..8cc9dbc 100644 Binary files a/build-QChatClient-Desktop-Debug/moc_loginscreen.o and b/build-QChatClient-Desktop-Debug/moc_loginscreen.o differ diff --git a/build-QChatClient-Desktop-Debug/ui_chatroom.h b/build-QChatClient-Desktop-Debug/ui_chatroom.h index 097be68..6b17446 100644 --- a/build-QChatClient-Desktop-Debug/ui_chatroom.h +++ b/build-QChatClient-Desktop-Debug/ui_chatroom.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'chatroom.ui' ** -** Created by: Qt User Interface Compiler version 5.0.1 +** Created by: Qt User Interface Compiler version 5.0.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/build-QChatClient-Desktop-Debug/ui_chatwindow.h b/build-QChatClient-Desktop-Debug/ui_chatwindow.h index b4b5712..61c3ad1 100644 --- a/build-QChatClient-Desktop-Debug/ui_chatwindow.h +++ b/build-QChatClient-Desktop-Debug/ui_chatwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'chatwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.0.1 +** Created by: Qt User Interface Compiler version 5.0.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/build-QChatClient-Desktop-Debug/ui_loginscreen.h b/build-QChatClient-Desktop-Debug/ui_loginscreen.h index 014dbf6..13dc0a8 100644 --- a/build-QChatClient-Desktop-Debug/ui_loginscreen.h +++ b/build-QChatClient-Desktop-Debug/ui_loginscreen.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'loginscreen.ui' ** -** Created by: Qt User Interface Compiler version 5.0.1 +** Created by: Qt User Interface Compiler version 5.0.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ -- libgit2 0.22.2