diff --git a/Makefile b/Makefile index 862c4d2..0846275 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,16 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 2 14:45:09 2020 +# Generated by qmake (2.01a) (Qt 4.8.7) on: Mon Mar 1 10:23:38 2021 # Project: OutilZT.pro # Template: app -# Command: c:\Qt\4.8.4\bin\qmake.exe -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile OutilZT.pro +# Command: c:\Qt\4.8.7\bin\qmake.exe -spec c:\Qt\4.8.7\mkspecs\win32-g++-4.6 -o Makefile OutilZT.pro ############################################################################# first: debug install: debug-install uninstall: debug-uninstall MAKEFILE = Makefile -QMAKE = c:\Qt\4.8.4\bin\qmake.exe +QMAKE = c:\Qt\4.8.7\bin\qmake.exe DEL_FILE = del CHK_DIR_EXISTS= if not exist MKDIR = mkdir @@ -63,63 +63,65 @@ release-install: $(MAKEFILE).Release FORCE release-uninstall: $(MAKEFILE).Release FORCE $(MAKE) -f $(MAKEFILE).Release uninstall -Makefile: OutilZT.pro c:/Qt/4.8.4/mkspecs/win32-g++/qmake.conf c:/Qt/4.8.4/mkspecs/features/device_config.prf \ - c:/Qt/4.8.4/mkspecs/qconfig.pri \ - c:/Qt/4.8.4/mkspecs/modules/qt_webkit_version.pri \ - c:/Qt/4.8.4/mkspecs/features/qt_functions.prf \ - c:/Qt/4.8.4/mkspecs/features/qt_config.prf \ - c:/Qt/4.8.4/mkspecs/features/exclusive_builds.prf \ - c:/Qt/4.8.4/mkspecs/features/default_pre.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/default_pre.prf \ - c:/Qt/4.8.4/mkspecs/features/debug.prf \ - c:/Qt/4.8.4/mkspecs/features/debug_and_release.prf \ - c:/Qt/4.8.4/mkspecs/features/default_post.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/default_post.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/rtti.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/exceptions.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/stl.prf \ - c:/Qt/4.8.4/mkspecs/features/shared.prf \ - c:/Qt/4.8.4/mkspecs/features/warn_on.prf \ - c:/Qt/4.8.4/mkspecs/features/qt.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/thread.prf \ - c:/Qt/4.8.4/mkspecs/features/moc.prf \ - c:/Qt/4.8.4/mkspecs/features/win32/windows.prf \ - c:/Qt/4.8.4/mkspecs/features/resources.prf \ - c:/Qt/4.8.4/mkspecs/features/uic.prf \ - c:/Qt/4.8.4/mkspecs/features/yacc.prf \ - c:/Qt/4.8.4/mkspecs/features/lex.prf \ - c:/Qt/4.8.4/mkspecs/features/include_source_dir.prf \ - c:/Qt/4.8.4/lib/qtmaind.prl - $(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile OutilZT.pro -c:\Qt\4.8.4\mkspecs\features\device_config.prf: -c:\Qt\4.8.4\mkspecs\qconfig.pri: -c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri: -c:\Qt\4.8.4\mkspecs\features\qt_functions.prf: -c:\Qt\4.8.4\mkspecs\features\qt_config.prf: -c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf: -c:\Qt\4.8.4\mkspecs\features\default_pre.prf: -c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf: -c:\Qt\4.8.4\mkspecs\features\debug.prf: -c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf: -c:\Qt\4.8.4\mkspecs\features\default_post.prf: -c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf: -c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf: -c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf: -c:\Qt\4.8.4\mkspecs\features\win32\stl.prf: -c:\Qt\4.8.4\mkspecs\features\shared.prf: -c:\Qt\4.8.4\mkspecs\features\warn_on.prf: -c:\Qt\4.8.4\mkspecs\features\qt.prf: -c:\Qt\4.8.4\mkspecs\features\win32\thread.prf: -c:\Qt\4.8.4\mkspecs\features\moc.prf: -c:\Qt\4.8.4\mkspecs\features\win32\windows.prf: -c:\Qt\4.8.4\mkspecs\features\resources.prf: -c:\Qt\4.8.4\mkspecs\features\uic.prf: -c:\Qt\4.8.4\mkspecs\features\yacc.prf: -c:\Qt\4.8.4\mkspecs\features\lex.prf: -c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf: -c:\Qt\4.8.4\lib\qtmaind.prl: +Makefile: OutilZT.pro c:/Qt/4.8.7/mkspecs/win32-g++-4.6/qmake.conf c:/Qt/4.8.7/mkspecs/features/device_config.prf \ + c:/Qt/4.8.7/mkspecs/qconfig.pri \ + c:/Qt/4.8.7/mkspecs/modules/qt_webkit_version.pri \ + c:/Qt/4.8.7/mkspecs/features/qt_functions.prf \ + c:/Qt/4.8.7/mkspecs/features/qt_config.prf \ + c:/Qt/4.8.7/mkspecs/win32-g++/qmake.conf \ + c:/Qt/4.8.7/mkspecs/features/exclusive_builds.prf \ + c:/Qt/4.8.7/mkspecs/features/default_pre.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/default_pre.prf \ + c:/Qt/4.8.7/mkspecs/features/debug.prf \ + c:/Qt/4.8.7/mkspecs/features/debug_and_release.prf \ + c:/Qt/4.8.7/mkspecs/features/default_post.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/default_post.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/rtti.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/exceptions.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/stl.prf \ + c:/Qt/4.8.7/mkspecs/features/shared.prf \ + c:/Qt/4.8.7/mkspecs/features/warn_on.prf \ + c:/Qt/4.8.7/mkspecs/features/qt.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/thread.prf \ + c:/Qt/4.8.7/mkspecs/features/moc.prf \ + c:/Qt/4.8.7/mkspecs/features/win32/windows.prf \ + c:/Qt/4.8.7/mkspecs/features/resources.prf \ + c:/Qt/4.8.7/mkspecs/features/uic.prf \ + c:/Qt/4.8.7/mkspecs/features/yacc.prf \ + c:/Qt/4.8.7/mkspecs/features/lex.prf \ + c:/Qt/4.8.7/mkspecs/features/include_source_dir.prf \ + c:/Qt/4.8.7/lib/qtmaind.prl + $(QMAKE) -spec c:\Qt\4.8.7\mkspecs\win32-g++-4.6 -o Makefile OutilZT.pro +c:\Qt\4.8.7\mkspecs\features\device_config.prf: +c:\Qt\4.8.7\mkspecs\qconfig.pri: +c:\Qt\4.8.7\mkspecs\modules\qt_webkit_version.pri: +c:\Qt\4.8.7\mkspecs\features\qt_functions.prf: +c:\Qt\4.8.7\mkspecs\features\qt_config.prf: +c:\Qt\4.8.7\mkspecs\win32-g++\qmake.conf: +c:\Qt\4.8.7\mkspecs\features\exclusive_builds.prf: +c:\Qt\4.8.7\mkspecs\features\default_pre.prf: +c:\Qt\4.8.7\mkspecs\features\win32\default_pre.prf: +c:\Qt\4.8.7\mkspecs\features\debug.prf: +c:\Qt\4.8.7\mkspecs\features\debug_and_release.prf: +c:\Qt\4.8.7\mkspecs\features\default_post.prf: +c:\Qt\4.8.7\mkspecs\features\win32\default_post.prf: +c:\Qt\4.8.7\mkspecs\features\win32\rtti.prf: +c:\Qt\4.8.7\mkspecs\features\win32\exceptions.prf: +c:\Qt\4.8.7\mkspecs\features\win32\stl.prf: +c:\Qt\4.8.7\mkspecs\features\shared.prf: +c:\Qt\4.8.7\mkspecs\features\warn_on.prf: +c:\Qt\4.8.7\mkspecs\features\qt.prf: +c:\Qt\4.8.7\mkspecs\features\win32\thread.prf: +c:\Qt\4.8.7\mkspecs\features\moc.prf: +c:\Qt\4.8.7\mkspecs\features\win32\windows.prf: +c:\Qt\4.8.7\mkspecs\features\resources.prf: +c:\Qt\4.8.7\mkspecs\features\uic.prf: +c:\Qt\4.8.7\mkspecs\features\yacc.prf: +c:\Qt\4.8.7\mkspecs\features\lex.prf: +c:\Qt\4.8.7\mkspecs\features\include_source_dir.prf: +c:\Qt\4.8.7\lib\qtmaind.prl: qmake: qmake_all FORCE - @$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile OutilZT.pro + @$(QMAKE) -spec c:\Qt\4.8.7\mkspecs\win32-g++-4.6 -o Makefile OutilZT.pro qmake_all: FORCE diff --git a/Makefile.Debug b/Makefile.Debug index b6e394e..64d18e9 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 2 14:45:09 2020 +# Generated by qmake (2.01a) (Qt 4.8.7) on: Mon Mar 1 10:23:38 2021 # Project: OutilZT.pro # Template: app ############################################################################# @@ -9,15 +9,15 @@ CC = gcc CXX = g++ -DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -CFLAGS = -pipe -g -Wall -Wextra $(DEFINES) -CXXFLAGS = -pipe -g -frtti -fexceptions -mthreads -Wall -Wextra $(DEFINES) -INCPATH = -I"c:\Qt\4.8.4\include\QtCore" -I"c:\Qt\4.8.4\include\QtNetwork" -I"c:\Qt\4.8.4\include\QtGui" -I"c:\Qt\4.8.4\include" -I"." -I"sources" -I"sources\GuiElements" -I"c:\Qt\4.8.4\include\ActiveQt" -I"debug" -I"c:\Qt\4.8.4\mkspecs\win32-g++" +DEFINES = -DUNICODE -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT +CFLAGS = -pipe -fno-keep-inline-dllexport -g -Wall -Wextra $(DEFINES) +CXXFLAGS = -pipe -fno-keep-inline-dllexport -g -frtti -fexceptions -mthreads -Wall -Wextra $(DEFINES) +INCPATH = -I"c:\Qt\4.8.7\include\QtCore" -I"c:\Qt\4.8.7\include\QtNetwork" -I"c:\Qt\4.8.7\include\QtGui" -I"c:\Qt\4.8.7\include" -I"." -I"sources" -I"sources\GuiElements" -I"c:\Qt\4.8.7\include\ActiveQt" -I"debug" -I"c:\Qt\4.8.7\mkspecs\win32-g++-4.6" LINK = g++ LFLAGS = -mthreads -Wl,-subsystem,windows -LIBS = -L"c:\Qt\4.8.4\lib" -lmingw32 -lqtmaind -lQtGuid4 -lQtNetworkd4 -lQtCored4 -QMAKE = c:\Qt\4.8.4\bin\qmake.exe -IDC = c:\Qt\4.8.4\bin\idc.exe +LIBS = -L"c:\Qt\4.8.7\lib" -lmingw32 -lqtmaind -lQtGuid4 -lQtNetworkd4 -lQtCored4 +QMAKE = c:\Qt\4.8.7\bin\qmake.exe +IDC = c:\Qt\4.8.7\bin\idc.exe IDL = midl ZIP = zip -r -9 DEF_FILE = @@ -203,10 +203,10 @@ $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OutilZT.Debug $(LIBS) qmake: FORCE - @$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile.Debug OutilZT.pro + @$(QMAKE) -spec c:\Qt\4.8.7\mkspecs\win32-g++-4.6 -o Makefile.Debug OutilZT.pro dist: - $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro c:\Qt\4.8.4\mkspecs\features\device_config.prf c:\Qt\4.8.4\mkspecs\qconfig.pri c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri c:\Qt\4.8.4\mkspecs\features\qt_functions.prf c:\Qt\4.8.4\mkspecs\features\qt_config.prf c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf c:\Qt\4.8.4\mkspecs\features\default_pre.prf c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf c:\Qt\4.8.4\mkspecs\features\debug.prf c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf c:\Qt\4.8.4\mkspecs\features\default_post.prf c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf c:\Qt\4.8.4\mkspecs\features\build_pass.prf c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf c:\Qt\4.8.4\mkspecs\features\win32\stl.prf c:\Qt\4.8.4\mkspecs\features\shared.prf c:\Qt\4.8.4\mkspecs\features\warn_on.prf c:\Qt\4.8.4\mkspecs\features\qt.prf c:\Qt\4.8.4\mkspecs\features\win32\thread.prf c:\Qt\4.8.4\mkspecs\features\moc.prf c:\Qt\4.8.4\mkspecs\features\win32\windows.prf c:\Qt\4.8.4\mkspecs\features\resources.prf c:\Qt\4.8.4\mkspecs\features\uic.prf c:\Qt\4.8.4\mkspecs\features\yacc.prf c:\Qt\4.8.4\mkspecs\features\lex.prf c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf c:\Qt\4.8.4\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro c:\Qt\4.8.7\mkspecs\features\device_config.prf c:\Qt\4.8.7\mkspecs\qconfig.pri c:\Qt\4.8.7\mkspecs\modules\qt_webkit_version.pri c:\Qt\4.8.7\mkspecs\features\qt_functions.prf c:\Qt\4.8.7\mkspecs\features\qt_config.prf c:\Qt\4.8.7\mkspecs\win32-g++\qmake.conf c:\Qt\4.8.7\mkspecs\features\exclusive_builds.prf c:\Qt\4.8.7\mkspecs\features\default_pre.prf c:\Qt\4.8.7\mkspecs\features\win32\default_pre.prf c:\Qt\4.8.7\mkspecs\features\debug.prf c:\Qt\4.8.7\mkspecs\features\debug_and_release.prf c:\Qt\4.8.7\mkspecs\features\default_post.prf c:\Qt\4.8.7\mkspecs\features\win32\default_post.prf c:\Qt\4.8.7\mkspecs\features\build_pass.prf c:\Qt\4.8.7\mkspecs\features\win32\rtti.prf c:\Qt\4.8.7\mkspecs\features\win32\exceptions.prf c:\Qt\4.8.7\mkspecs\features\win32\stl.prf c:\Qt\4.8.7\mkspecs\features\shared.prf c:\Qt\4.8.7\mkspecs\features\warn_on.prf c:\Qt\4.8.7\mkspecs\features\qt.prf c:\Qt\4.8.7\mkspecs\features\win32\thread.prf c:\Qt\4.8.7\mkspecs\features\moc.prf c:\Qt\4.8.7\mkspecs\features\win32\windows.prf c:\Qt\4.8.7\mkspecs\features\resources.prf c:\Qt\4.8.7\mkspecs\features\uic.prf c:\Qt\4.8.7\mkspecs\features\yacc.prf c:\Qt\4.8.7\mkspecs\features\lex.prf c:\Qt\4.8.7\mkspecs\features\include_source_dir.prf c:\Qt\4.8.7\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) debug\main.o debug\OutilZT.o debug\MainPanel.o debug\MainPage.o debug\GuiPage.o debug\PushButton.o debug\LogViewPage.o debug\TextButtonWidget.o debug\RankRulerWidget.o debug\GraphCursorWidget.o debug\EventsRulerWidget.o debug\AnalogGraphItem.o debug\GraphItem.o debug\GraphRulerWidget.o debug\ZTData.o debug\LogMgr.o debug\TrainLogFileMgr.o debug\LogsListPage.o debug\OptionsPage.o debug\Settings.o debug\NetworkZTListPage.o debug\ToggleTextButtonWidget.o debug\NetworkCtrlPage.o debug\NetworkManager.o debug\TxRxWidget.o debug\TCPProtocol.o debug\RemoteZTPage.o debug\ZTLogViewerPage.o debug\ProgressBarPage.o debug\RemoteZTCtrlPage.o debug\ToggleButtonWidget.o debug\UDPProtocol.o debug\DatabaseMgrPage.o debug\ZTLogsListPage.o debug\ZTLogFilesMgr.o debug\DirParserThread.o debug\moc_OutilZT.o debug\moc_MainPanel.o debug\moc_MainPage.o debug\moc_Guipage.o debug\moc_PushButton.o debug\moc_LogViewPage.o debug\moc_TextButtonWidget.o debug\moc_RankRulerWidget.o debug\moc_GraphCursorWidget.o debug\moc_EventsRulerWidget.o debug\moc_AnalogGraphItem.o debug\moc_GraphItem.o debug\moc_GraphRulerWidget.o debug\moc_LogMgr.o debug\moc_LogsListPage.o debug\moc_OptionsPage.o debug\moc_NetworkZTListPage.o debug\moc_ToggleTextButtonWidget.o debug\moc_NetworkCtrlPage.o debug\moc_NetworkManager.o debug\moc_TxRxWidget.o debug\moc_RemoteZTPage.o debug\moc_ZTLogViewerPage.o debug\moc_ProgressBarPage.o debug\moc_RemoteZTCtrlPage.o debug\moc_ToggleButtonWidget.o debug\moc_DatabaseMgrPage.o debug\moc_ZTLogsListPage.o debug\moc_ZTLogFilesMgr.o debug\moc_DirParserThread.o @@ -234,22 +234,22 @@ debug/moc_OutilZT.cpp: sources/MainPanel.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h \ sources/OutilZT.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o debug\moc_OutilZT.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o debug\moc_OutilZT.cpp debug/moc_MainPanel.cpp: sources/GlobalDefine.h \ sources/MainPanel.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o debug\moc_MainPanel.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o debug\moc_MainPanel.cpp debug/moc_MainPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/MainPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o debug\moc_MainPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o debug\moc_MainPage.cpp debug/moc_Guipage.cpp: sources/GuiElements/Guipage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o debug\moc_Guipage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o debug\moc_Guipage.cpp debug/moc_PushButton.cpp: sources/GuiElements/PushButton.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o debug\moc_PushButton.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o debug\moc_PushButton.cpp debug/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ @@ -261,123 +261,123 @@ debug/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h \ sources/GuiElements/LogViewPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o debug\moc_LogViewPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o debug\moc_LogViewPage.cpp debug/moc_TextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o debug\moc_TextButtonWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o debug\moc_TextButtonWidget.cpp debug/moc_RankRulerWidget.cpp: sources/GuiElements/RankRulerWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o debug\moc_RankRulerWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o debug\moc_RankRulerWidget.cpp debug/moc_GraphCursorWidget.cpp: sources/GuiElements/GraphCursorWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o debug\moc_GraphCursorWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o debug\moc_GraphCursorWidget.cpp debug/moc_EventsRulerWidget.cpp: sources/GuiElements/EventsRulerWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o debug\moc_EventsRulerWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o debug\moc_EventsRulerWidget.cpp debug/moc_AnalogGraphItem.cpp: sources/GuiElements/AnalogGraphItem.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o debug\moc_AnalogGraphItem.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o debug\moc_AnalogGraphItem.cpp debug/moc_GraphItem.cpp: sources/GuiElements/GraphItem.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o debug\moc_GraphItem.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o debug\moc_GraphItem.cpp debug/moc_GraphRulerWidget.cpp: sources/GuiElements/GraphRulerWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o debug\moc_GraphRulerWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o debug\moc_GraphRulerWidget.cpp debug/moc_LogMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/LogMgr.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o debug\moc_LogMgr.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o debug\moc_LogMgr.cpp debug/moc_LogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/LogsListPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o debug\moc_LogsListPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o debug\moc_LogsListPage.cpp debug/moc_OptionsPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/OptionsPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o debug\moc_OptionsPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o debug\moc_OptionsPage.cpp debug/moc_NetworkZTListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/NetworkZTListPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o debug\moc_NetworkZTListPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o debug\moc_NetworkZTListPage.cpp debug/moc_ToggleTextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleTextButtonWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o debug\moc_ToggleTextButtonWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o debug\moc_ToggleTextButtonWidget.cpp debug/moc_NetworkCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h \ sources/GuiElements/NetworkCtrlPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o debug\moc_NetworkCtrlPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o debug\moc_NetworkCtrlPage.cpp debug/moc_NetworkManager.cpp: sources/GlobalDefine.h \ sources/ZTData.h \ sources/TCPProtocol.h \ sources/UDPProtocol.h \ sources/NetworkManager.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o debug\moc_NetworkManager.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o debug\moc_NetworkManager.cpp debug/moc_TxRxWidget.cpp: sources/GuiElements/TxRxWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o debug\moc_TxRxWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o debug\moc_TxRxWidget.cpp debug/moc_RemoteZTPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/RemoteZTPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o debug\moc_RemoteZTPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o debug\moc_RemoteZTPage.cpp debug/moc_ZTLogViewerPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogViewerPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o debug\moc_ZTLogViewerPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o debug\moc_ZTLogViewerPage.cpp debug/moc_ProgressBarPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ProgressBarPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o debug\moc_ProgressBarPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o debug\moc_ProgressBarPage.cpp debug/moc_RemoteZTCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h \ sources/GuiElements/RemoteZTCtrlPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o debug\moc_RemoteZTCtrlPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o debug\moc_RemoteZTCtrlPage.cpp debug/moc_ToggleButtonWidget.cpp: sources/GuiElements/ToggleButtonWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o debug\moc_ToggleButtonWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o debug\moc_ToggleButtonWidget.cpp debug/moc_DatabaseMgrPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/DatabaseMgrPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o debug\moc_DatabaseMgrPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o debug\moc_DatabaseMgrPage.cpp debug/moc_ZTLogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogsListPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o debug\moc_ZTLogsListPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o debug\moc_ZTLogsListPage.cpp debug/moc_ZTLogFilesMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/ZTLogFilesMgr.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o debug\moc_ZTLogFilesMgr.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o debug\moc_ZTLogFilesMgr.cpp debug/moc_DirParserThread.cpp: sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h \ sources/DirParserThread.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o debug\moc_DirParserThread.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o debug\moc_DirParserThread.cpp compiler_rcc_make_all: compiler_rcc_clean: diff --git a/Makefile.Release b/Makefile.Release index 0c94d41..8b19b2c 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jun 2 14:45:09 2020 +# Generated by qmake (2.01a) (Qt 4.8.7) on: Mon Mar 1 10:23:38 2021 # Project: OutilZT.pro # Template: app ############################################################################# @@ -9,15 +9,15 @@ CC = gcc CXX = g++ -DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -CFLAGS = -pipe -O2 -Wall -Wextra $(DEFINES) -CXXFLAGS = -pipe -O2 -frtti -fexceptions -mthreads -Wall -Wextra $(DEFINES) -INCPATH = -I"c:\Qt\4.8.4\include\QtCore" -I"c:\Qt\4.8.4\include\QtNetwork" -I"c:\Qt\4.8.4\include\QtGui" -I"c:\Qt\4.8.4\include" -I"." -I"sources" -I"sources\GuiElements" -I"c:\Qt\4.8.4\include\ActiveQt" -I"release" -I"c:\Qt\4.8.4\mkspecs\win32-g++" +DEFINES = -DUNICODE -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT +CFLAGS = -pipe -fno-keep-inline-dllexport -O2 -Wall -Wextra $(DEFINES) +CXXFLAGS = -pipe -fno-keep-inline-dllexport -O2 -frtti -fexceptions -mthreads -Wall -Wextra $(DEFINES) +INCPATH = -I"c:\Qt\4.8.7\include\QtCore" -I"c:\Qt\4.8.7\include\QtNetwork" -I"c:\Qt\4.8.7\include\QtGui" -I"c:\Qt\4.8.7\include" -I"." -I"sources" -I"sources\GuiElements" -I"c:\Qt\4.8.7\include\ActiveQt" -I"release" -I"c:\Qt\4.8.7\mkspecs\win32-g++-4.6" LINK = g++ LFLAGS = -Wl,-s -mthreads -Wl,-subsystem,windows -LIBS = -L"c:\Qt\4.8.4\lib" -lmingw32 -lqtmain -lQtGui4 -lQtNetwork4 -lQtCore4 -QMAKE = c:\Qt\4.8.4\bin\qmake.exe -IDC = c:\Qt\4.8.4\bin\idc.exe +LIBS = -L"c:\Qt\4.8.7\lib" -lmingw32 -lqtmain -lQtGui4 -lQtNetwork4 -lQtCore4 +QMAKE = c:\Qt\4.8.7\bin\qmake.exe +IDC = c:\Qt\4.8.7\bin\idc.exe IDL = midl ZIP = zip -r -9 DEF_FILE = @@ -203,10 +203,10 @@ $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OutilZT.Release $(LIBS) qmake: FORCE - @$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ -o Makefile.Release OutilZT.pro + @$(QMAKE) -spec c:\Qt\4.8.7\mkspecs\win32-g++-4.6 -o Makefile.Release OutilZT.pro dist: - $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro c:\Qt\4.8.4\mkspecs\features\device_config.prf c:\Qt\4.8.4\mkspecs\qconfig.pri c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri c:\Qt\4.8.4\mkspecs\features\qt_functions.prf c:\Qt\4.8.4\mkspecs\features\qt_config.prf c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf c:\Qt\4.8.4\mkspecs\features\default_pre.prf c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf c:\Qt\4.8.4\mkspecs\features\release.prf c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf c:\Qt\4.8.4\mkspecs\features\default_post.prf c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf c:\Qt\4.8.4\mkspecs\features\build_pass.prf c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf c:\Qt\4.8.4\mkspecs\features\win32\stl.prf c:\Qt\4.8.4\mkspecs\features\shared.prf c:\Qt\4.8.4\mkspecs\features\warn_on.prf c:\Qt\4.8.4\mkspecs\features\qt.prf c:\Qt\4.8.4\mkspecs\features\win32\thread.prf c:\Qt\4.8.4\mkspecs\features\moc.prf c:\Qt\4.8.4\mkspecs\features\win32\windows.prf c:\Qt\4.8.4\mkspecs\features\resources.prf c:\Qt\4.8.4\mkspecs\features\uic.prf c:\Qt\4.8.4\mkspecs\features\yacc.prf c:\Qt\4.8.4\mkspecs\features\lex.prf c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf c:\Qt\4.8.4\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro c:\Qt\4.8.7\mkspecs\features\device_config.prf c:\Qt\4.8.7\mkspecs\qconfig.pri c:\Qt\4.8.7\mkspecs\modules\qt_webkit_version.pri c:\Qt\4.8.7\mkspecs\features\qt_functions.prf c:\Qt\4.8.7\mkspecs\features\qt_config.prf c:\Qt\4.8.7\mkspecs\win32-g++\qmake.conf c:\Qt\4.8.7\mkspecs\features\exclusive_builds.prf c:\Qt\4.8.7\mkspecs\features\default_pre.prf c:\Qt\4.8.7\mkspecs\features\win32\default_pre.prf c:\Qt\4.8.7\mkspecs\features\release.prf c:\Qt\4.8.7\mkspecs\features\debug_and_release.prf c:\Qt\4.8.7\mkspecs\features\default_post.prf c:\Qt\4.8.7\mkspecs\features\win32\default_post.prf c:\Qt\4.8.7\mkspecs\features\build_pass.prf c:\Qt\4.8.7\mkspecs\features\win32\rtti.prf c:\Qt\4.8.7\mkspecs\features\win32\exceptions.prf c:\Qt\4.8.7\mkspecs\features\win32\stl.prf c:\Qt\4.8.7\mkspecs\features\shared.prf c:\Qt\4.8.7\mkspecs\features\warn_on.prf c:\Qt\4.8.7\mkspecs\features\qt.prf c:\Qt\4.8.7\mkspecs\features\win32\thread.prf c:\Qt\4.8.7\mkspecs\features\moc.prf c:\Qt\4.8.7\mkspecs\features\win32\windows.prf c:\Qt\4.8.7\mkspecs\features\resources.prf c:\Qt\4.8.7\mkspecs\features\uic.prf c:\Qt\4.8.7\mkspecs\features\yacc.prf c:\Qt\4.8.7\mkspecs\features\lex.prf c:\Qt\4.8.7\mkspecs\features\include_source_dir.prf c:\Qt\4.8.7\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) release\main.o release\OutilZT.o release\MainPanel.o release\MainPage.o release\GuiPage.o release\PushButton.o release\LogViewPage.o release\TextButtonWidget.o release\RankRulerWidget.o release\GraphCursorWidget.o release\EventsRulerWidget.o release\AnalogGraphItem.o release\GraphItem.o release\GraphRulerWidget.o release\ZTData.o release\LogMgr.o release\TrainLogFileMgr.o release\LogsListPage.o release\OptionsPage.o release\Settings.o release\NetworkZTListPage.o release\ToggleTextButtonWidget.o release\NetworkCtrlPage.o release\NetworkManager.o release\TxRxWidget.o release\TCPProtocol.o release\RemoteZTPage.o release\ZTLogViewerPage.o release\ProgressBarPage.o release\RemoteZTCtrlPage.o release\ToggleButtonWidget.o release\UDPProtocol.o release\DatabaseMgrPage.o release\ZTLogsListPage.o release\ZTLogFilesMgr.o release\DirParserThread.o release\moc_OutilZT.o release\moc_MainPanel.o release\moc_MainPage.o release\moc_Guipage.o release\moc_PushButton.o release\moc_LogViewPage.o release\moc_TextButtonWidget.o release\moc_RankRulerWidget.o release\moc_GraphCursorWidget.o release\moc_EventsRulerWidget.o release\moc_AnalogGraphItem.o release\moc_GraphItem.o release\moc_GraphRulerWidget.o release\moc_LogMgr.o release\moc_LogsListPage.o release\moc_OptionsPage.o release\moc_NetworkZTListPage.o release\moc_ToggleTextButtonWidget.o release\moc_NetworkCtrlPage.o release\moc_NetworkManager.o release\moc_TxRxWidget.o release\moc_RemoteZTPage.o release\moc_ZTLogViewerPage.o release\moc_ProgressBarPage.o release\moc_RemoteZTCtrlPage.o release\moc_ToggleButtonWidget.o release\moc_DatabaseMgrPage.o release\moc_ZTLogsListPage.o release\moc_ZTLogFilesMgr.o release\moc_DirParserThread.o @@ -234,22 +234,22 @@ release/moc_OutilZT.cpp: sources/MainPanel.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h \ sources/OutilZT.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o release\moc_OutilZT.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o release\moc_OutilZT.cpp release/moc_MainPanel.cpp: sources/GlobalDefine.h \ sources/MainPanel.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o release\moc_MainPanel.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o release\moc_MainPanel.cpp release/moc_MainPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/MainPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o release\moc_MainPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o release\moc_MainPage.cpp release/moc_Guipage.cpp: sources/GuiElements/Guipage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o release\moc_Guipage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o release\moc_Guipage.cpp release/moc_PushButton.cpp: sources/GuiElements/PushButton.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o release\moc_PushButton.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o release\moc_PushButton.cpp release/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ @@ -261,123 +261,123 @@ release/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h \ sources/GuiElements/LogViewPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o release\moc_LogViewPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o release\moc_LogViewPage.cpp release/moc_TextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o release\moc_TextButtonWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o release\moc_TextButtonWidget.cpp release/moc_RankRulerWidget.cpp: sources/GuiElements/RankRulerWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o release\moc_RankRulerWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o release\moc_RankRulerWidget.cpp release/moc_GraphCursorWidget.cpp: sources/GuiElements/GraphCursorWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o release\moc_GraphCursorWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o release\moc_GraphCursorWidget.cpp release/moc_EventsRulerWidget.cpp: sources/GuiElements/EventsRulerWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o release\moc_EventsRulerWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o release\moc_EventsRulerWidget.cpp release/moc_AnalogGraphItem.cpp: sources/GuiElements/AnalogGraphItem.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o release\moc_AnalogGraphItem.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o release\moc_AnalogGraphItem.cpp release/moc_GraphItem.cpp: sources/GuiElements/GraphItem.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o release\moc_GraphItem.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o release\moc_GraphItem.cpp release/moc_GraphRulerWidget.cpp: sources/GuiElements/GraphRulerWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o release\moc_GraphRulerWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o release\moc_GraphRulerWidget.cpp release/moc_LogMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/LogMgr.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o release\moc_LogMgr.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o release\moc_LogMgr.cpp release/moc_LogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/LogsListPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o release\moc_LogsListPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o release\moc_LogsListPage.cpp release/moc_OptionsPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/OptionsPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o release\moc_OptionsPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o release\moc_OptionsPage.cpp release/moc_NetworkZTListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/NetworkZTListPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o release\moc_NetworkZTListPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o release\moc_NetworkZTListPage.cpp release/moc_ToggleTextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleTextButtonWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o release\moc_ToggleTextButtonWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o release\moc_ToggleTextButtonWidget.cpp release/moc_NetworkCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h \ sources/GuiElements/NetworkCtrlPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o release\moc_NetworkCtrlPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o release\moc_NetworkCtrlPage.cpp release/moc_NetworkManager.cpp: sources/GlobalDefine.h \ sources/ZTData.h \ sources/TCPProtocol.h \ sources/UDPProtocol.h \ sources/NetworkManager.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o release\moc_NetworkManager.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o release\moc_NetworkManager.cpp release/moc_TxRxWidget.cpp: sources/GuiElements/TxRxWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o release\moc_TxRxWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o release\moc_TxRxWidget.cpp release/moc_RemoteZTPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/RemoteZTPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o release\moc_RemoteZTPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o release\moc_RemoteZTPage.cpp release/moc_ZTLogViewerPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogViewerPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o release\moc_ZTLogViewerPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o release\moc_ZTLogViewerPage.cpp release/moc_ProgressBarPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ProgressBarPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o release\moc_ProgressBarPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o release\moc_ProgressBarPage.cpp release/moc_RemoteZTCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h \ sources/GuiElements/RemoteZTCtrlPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o release\moc_RemoteZTCtrlPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o release\moc_RemoteZTCtrlPage.cpp release/moc_ToggleButtonWidget.cpp: sources/GuiElements/ToggleButtonWidget.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o release\moc_ToggleButtonWidget.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o release\moc_ToggleButtonWidget.cpp release/moc_DatabaseMgrPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/DatabaseMgrPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o release\moc_DatabaseMgrPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o release\moc_DatabaseMgrPage.cpp release/moc_ZTLogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogsListPage.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o release\moc_ZTLogsListPage.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o release\moc_ZTLogsListPage.cpp release/moc_ZTLogFilesMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/ZTLogFilesMgr.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o release\moc_ZTLogFilesMgr.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o release\moc_ZTLogFilesMgr.cpp release/moc_DirParserThread.cpp: sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h \ sources/DirParserThread.h - C:\Qt\4.8.4\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o release\moc_DirParserThread.cpp + C:\Qt\4.8.7\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o release\moc_DirParserThread.cpp compiler_rcc_make_all: compiler_rcc_clean: diff --git a/OutilZT.pro.user.22 b/OutilZT.pro.user.22 new file mode 100644 index 0000000..b8c694a --- /dev/null +++ b/OutilZT.pro.user.22 @@ -0,0 +1,514 @@ + + + + + + EnvironmentId + {5a351af6-dc3b-4afc-af92-7da5e3a5cd12} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + + false + + false + true + true + false + false + true + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Qt 4.8.7 + Qt 4.8.7 + {8820e404-d75e-4d7e-80ff-354d5dfc06d1} + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/build-OutilZT-Qt_4_8_7-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/Main/Fichiers/JOB/build-OutilZT-Qt_4_8_7-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 2 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/OutilZT.pro.user.3910d82.4.8-pre1 b/OutilZT.pro.user.3910d82.4.8-pre1 new file mode 100644 index 0000000..a31a5cb --- /dev/null +++ b/OutilZT.pro.user.3910d82.4.8-pre1 @@ -0,0 +1,264 @@ + + + + + + EnvironmentId + {3910d82d-eb4d-4f98-b80b-abade0a050ed} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Qt 4.8.4 (4.8.4) + Qt 4.8.4 (4.8.4) + {405bb92b-0b67-4af0-af03-a14c8d44066a} + 1 + 0 + 0 + + D:/Main/Fichiers/JOB/OutilZT + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Main/Fichiers/JOB/OutilZT/release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + OutilZT + + Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + true + -ing + OutilZT.pro + false + + D:/Main/Fichiers/JOB/OutilZT/release + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/OutilZT.pro.user.4.8-pre1 b/OutilZT.pro.user.4.8-pre1 new file mode 100644 index 0000000..cbd29a4 --- /dev/null +++ b/OutilZT.pro.user.4.8-pre1 @@ -0,0 +1,704 @@ + + + + + + EnvironmentId + {5a351af6-dc3b-4afc-af92-7da5e3a5cd12} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Qt 4.8.7 + Qt 4.8.7 + {8820e404-d75e-4d7e-80ff-354d5dfc06d1} + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/OutilZT + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Main/Fichiers/JOB/OutilZT + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + OutilZT + + Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + true + + OutilZT.pro + false + + D:/Main/Fichiers/JOB/OutilZT + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop + Desktop + {99c4ca36-b5ea-452c-b86e-54d367b4bb82} + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/Error in " Util.asciify("build-OutilZT-Desktop-Debug")": TypeError: Property 'asciify' of object Core::Internal::UtilsJsExtension(0xa44bf88) is not a function + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Main/Fichiers/JOB/Error in " Util.asciify("build-OutilZT-Desktop-Release")": TypeError: Property 'asciify' of object Core::Internal::UtilsJsExtension(0xa44bf88) is not a function + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + OutilZT + + Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + true + + OutilZT.pro + false + + D:/Main/Fichiers/JOB/OutilZT + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Qt 5.14.2 + Qt 5.14.2 + {dc2b548b-27bc-4e25-8500-cc36640735d8} + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/Error in " Util.asciify("build-OutilZT-Qt_5_14_2-Debug")": TypeError: Property 'asciify' of object Core::Internal::UtilsJsExtension(0xa44bf88) is not a function + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Main/Fichiers/JOB/Error in " Util.asciify("build-OutilZT-Qt_5_14_2-Release")": TypeError: Property 'asciify' of object Core::Internal::UtilsJsExtension(0xa44bf88) is not a function + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/Main/Fichiers/JOB/Error in " Util.asciify("build-OutilZT-Qt_5_14_2-Profile")": TypeError: Property 'asciify' of object Core::Internal::UtilsJsExtension(0xa44bf88) is not a function + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + OutilZT + + Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + true + + OutilZT.pro + false + + D:/Main/Fichiers/JOB/OutilZT + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + +