From 6b2222a520776f77e5b8aca2d3c43b1a02362287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:16:05 +0300 Subject: [PATCH 01/13] removed Unix source files from QT --- Makefile.in | 56 --------------------------------------- build/bakefiles/files.bkl | 3 --- build/cmake/files.cmake | 3 --- build/files | 3 --- 4 files changed, 65 deletions(-) diff --git a/Makefile.in b/Makefile.in index f0363aebb4..78cb8cb0bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5615,7 +5615,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ monodll_qt_dcscreen.o \ monodll_defs.o \ monodll_qt_dialog.o \ - monodll_unix_dialup.o \ monodll_qt_display.o \ monodll_qt_dnd.o \ monodll_qt_evtloop.o \ @@ -6136,8 +6135,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_qt_dataview.o \ monodll_dvrenderer.o \ monodll_dvrenderers.o \ - monodll_unix_joystick.o \ - monodll_unix_sound.o \ monodll_qt_taskbar.o \ monodll_taskbarcmn.o \ monodll_qt_utils.o \ @@ -6267,8 +6264,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monodll_qt_dataview.o \ monodll_dvrenderer.o \ monodll_dvrenderers.o \ - monodll_unix_joystick.o \ - monodll_unix_sound.o \ monodll_qt_taskbar.o \ monodll_taskbarcmn.o \ monodll_qt_utils.o \ @@ -7698,7 +7693,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ monolib_qt_dcscreen.o \ monolib_defs.o \ monolib_qt_dialog.o \ - monolib_unix_dialup.o \ monolib_qt_display.o \ monolib_qt_dnd.o \ monolib_qt_evtloop.o \ @@ -8219,8 +8213,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ monolib_qt_dataview.o \ monolib_dvrenderer.o \ monolib_dvrenderers.o \ - monolib_unix_joystick.o \ - monolib_unix_sound.o \ monolib_qt_taskbar.o \ monolib_taskbarcmn.o \ monolib_qt_utils.o \ @@ -8350,8 +8342,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ monolib_qt_dataview.o \ monolib_dvrenderer.o \ monolib_dvrenderers.o \ - monolib_unix_joystick.o \ - monolib_unix_sound.o \ monolib_qt_taskbar.o \ monolib_taskbarcmn.o \ monolib_qt_utils.o \ @@ -9927,7 +9917,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ coredll_qt_dcscreen.o \ coredll_defs.o \ coredll_qt_dialog.o \ - coredll_unix_dialup.o \ coredll_qt_display.o \ coredll_qt_dnd.o \ coredll_qt_evtloop.o \ @@ -11443,7 +11432,6 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ corelib_qt_dcscreen.o \ corelib_defs.o \ corelib_qt_dialog.o \ - corelib_unix_dialup.o \ corelib_qt_display.o \ corelib_qt_dnd.o \ corelib_qt_evtloop.o \ @@ -12033,8 +12021,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \ advdll_qt_dataview.o \ advdll_dvrenderer.o \ advdll_dvrenderers.o \ - advdll_unix_joystick.o \ - advdll_unix_sound.o \ advdll_qt_taskbar.o \ advdll_taskbarcmn.o \ advdll_utils.o \ @@ -12164,8 +12150,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \ advdll_qt_dataview.o \ advdll_dvrenderer.o \ advdll_dvrenderers.o \ - advdll_unix_joystick.o \ - advdll_unix_sound.o \ advdll_qt_taskbar.o \ advdll_taskbarcmn.o \ advdll_utils.o \ @@ -12353,8 +12337,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \ advlib_qt_dataview.o \ advlib_dvrenderer.o \ advlib_dvrenderers.o \ - advlib_unix_joystick.o \ - advlib_unix_sound.o \ advlib_qt_taskbar.o \ advlib_taskbarcmn.o \ advlib_utils.o \ @@ -12484,8 +12466,6 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \ advlib_qt_dataview.o \ advlib_dvrenderer.o \ advlib_dvrenderers.o \ - advlib_unix_joystick.o \ - advlib_unix_sound.o \ advlib_qt_taskbar.o \ advlib_taskbarcmn.o \ advlib_utils.o \ @@ -18072,9 +18052,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -21084,9 +21061,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp -@COND_TOOLKIT_QT_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @@ -21114,9 +21088,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp -@COND_TOOLKIT_QT_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp @@ -23331,9 +23302,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -26343,9 +26311,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp -@COND_TOOLKIT_QT_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @@ -26373,9 +26338,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp -@COND_TOOLKIT_QT_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp @@ -28665,9 +28627,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -32412,9 +32371,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp - @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp @@ -35445,9 +35401,6 @@ advdll_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_X11@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp -@COND_TOOLKIT_QT@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp - @COND_TOOLKIT_MOTIF@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @@ -35475,9 +35428,6 @@ advdll_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_X11@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp -@COND_TOOLKIT_QT@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp - @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp @@ -35958,9 +35908,6 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_X11@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp -@COND_TOOLKIT_QT@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp - @COND_TOOLKIT_MOTIF@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp @@ -35988,9 +35935,6 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_X11@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp -@COND_TOOLKIT_QT@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp - @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index ea64e2d1d6..618b65a5d2 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -363,7 +363,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/qt/dcscreen.cpp src/qt/defs.cpp src/qt/dialog.cpp - src/unix/dialup.cpp src/qt/display.cpp src/qt/dnd.cpp src/qt/evtloop.cpp @@ -439,8 +438,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/qt/dataview.cpp src/qt/dvrenderer.cpp src/qt/dvrenderers.cpp - src/unix/joystick.cpp - src/unix/sound.cpp src/qt/taskbar.cpp src/common/taskbarcmn.cpp src/qt/utils.cpp diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index c8edde689c..01046edd55 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -285,7 +285,6 @@ set(QT_SRC src/qt/dcscreen.cpp src/qt/defs.cpp src/qt/dialog.cpp - src/unix/dialup.cpp src/qt/display.cpp src/qt/dnd.cpp src/qt/evtloop.cpp @@ -361,8 +360,6 @@ set(ADVANCED_QT_SRC src/qt/dataview.cpp src/qt/dvrenderer.cpp src/qt/dvrenderers.cpp - src/unix/joystick.cpp - src/unix/sound.cpp src/qt/taskbar.cpp src/common/taskbarcmn.cpp src/qt/utils.cpp diff --git a/build/files b/build/files index 9f7f68c0b5..62db6a6de2 100644 --- a/build/files +++ b/build/files @@ -308,7 +308,6 @@ QT_SRC= src/qt/dcscreen.cpp src/qt/defs.cpp src/qt/dialog.cpp - src/unix/dialup.cpp src/qt/display.cpp src/qt/dnd.cpp src/qt/evtloop.cpp @@ -382,8 +381,6 @@ ADVANCED_QT_SRC= src/qt/dataview.cpp src/qt/dvrenderer.cpp src/qt/dvrenderers.cpp - src/unix/joystick.cpp - src/unix/sound.cpp src/qt/taskbar.cpp src/common/taskbarcmn.cpp src/qt/utils.cpp From 8fc8220b6ab9926db969d2d0aa1c9b86e04e7d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:24:47 +0300 Subject: [PATCH 02/13] removed Qt value of TOOLKIT, kept only QT --- Makefile.in | 2 +- autoconf_inc.m4 | 6 ------ build/bakefiles/files.bkl | 2 +- configure | 6 ------ 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index 78cb8cb0bc..ff449577da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2254,7 +2254,7 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM = \ @COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h @COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h -@COND_TOOLKIT_Qt@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h +@COND_TOOLKIT_QT@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h @COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 98d7d98136..f3914c2f1a 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -902,12 +902,6 @@ dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ### COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0) -dnl ### begin block 20_COND_TOOLKIT_Qt[wx.bkl] ### - COND_TOOLKIT_Qt="#" - if test "x$TOOLKIT" = "xQt" ; then - COND_TOOLKIT_Qt="" - fi - AC_SUBST(COND_TOOLKIT_Qt) dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ### COND_TOOLKIT_X11="#" if test "x$TOOLKIT" = "xX11" ; then diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 618b65a5d2..80bda4474a 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3359,7 +3359,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/gtk1/glcanvas.h wx/unix/glx11.h - wx/qt/glcanvas.h + wx/qt/glcanvas.h wx/msw/glcanvas.h wx/x11/glcanvas.h wx/unix/glx11.h wx/x11/glcanvas.h wx/unix/glx11.h diff --git a/configure b/configure index 283e60c3a5..41198b8a52 100755 --- a/configure +++ b/configure @@ -700,7 +700,6 @@ COND_TOOLKIT_X11_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11 -COND_TOOLKIT_Qt COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_QT_USE_GUI_1 COND_TOOLKIT_QT @@ -41457,11 +41456,6 @@ EOF COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_Qt="#" - if test "x$TOOLKIT" = "xQt" ; then - COND_TOOLKIT_Qt="" - fi - COND_TOOLKIT_X11="#" if test "x$TOOLKIT" = "xX11" ; then COND_TOOLKIT_X11="" From 69c5d5a62715256e8014cc577b6dfe76fc8c5621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:28:47 +0300 Subject: [PATCH 03/13] more changes to accept mingw64 --- build/aclocal/bakefile.m4 | 4 ++-- configure | 10 +++++----- configure.in | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index 438c071bf6..c97afbb173 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -76,7 +76,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM], if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then case "${BAKEFILE_HOST}" in - *-*-mingw32* ) + *-*-mingw* ) PLATFORM_WIN32=1 ;; *-*-darwin* ) @@ -197,7 +197,7 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES], DLLPREFIX="cyg" dlldir="$bindir" ;; - *-*-mingw32* ) + *-*-mingw* ) SO_SUFFIX="dll" SO_SUFFIX_MODULE="dll" DLLIMP_SUFFIX="dll.a" diff --git a/configure b/configure index 41198b8a52..1cf0f4cc0d 100755 --- a/configure +++ b/configure @@ -23743,7 +23743,7 @@ fi LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32" case "${host}" in - x86_64-*-mingw32* ) + x86_64-*-mingw* ) WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" ;; esac @@ -23776,7 +23776,7 @@ if test "$wxUSE_GUI" = "yes"; then GUIDIST=MSW_DIST case "${host}" in - *-*-mingw32* ) + *-*-mingw* ) WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" esac fi @@ -33240,7 +33240,7 @@ $as_echo "$wx_cv_type_abi_forced_unwind" >&6; } else if test "$wxUSE_THREADS" = "yes" ; then case "${host}" in - x86_64-*-mingw32* ) + x86_64-*-mingw* ) ;; *-*-mingw32* ) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 @@ -39810,7 +39810,7 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then case "${BAKEFILE_HOST}" in - *-*-mingw32* ) + *-*-mingw* ) PLATFORM_WIN32=1 ;; *-*-darwin* ) @@ -39904,7 +39904,7 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; } DLLPREFIX="cyg" dlldir="$bindir" ;; - *-*-mingw32* ) + *-*-mingw* ) SO_SUFFIX="dll" SO_SUFFIX_MODULE="dll" DLLIMP_SUFFIX="dll.a" diff --git a/configure.in b/configure.in index 08a9f46b1a..9a52cc508c 100644 --- a/configure.in +++ b/configure.in @@ -2746,7 +2746,7 @@ if test "$USE_WIN32" = 1 ; then LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32" case "${host}" in - x86_64-*-mingw32* ) + x86_64-*-mingw* ) dnl we need to define this to embed the manifest for correct dnl platform from wx/msw/wx.rc (this is not needed for x86 which is dnl the default in wx/msw/rcdefs.h) @@ -2785,7 +2785,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl -mwindows causes a heap of other default gui libs to be linked in. case "${host}" in - *-*-mingw32* ) + *-*-mingw* ) WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" esac fi @@ -5012,7 +5012,7 @@ dnl from if !MSW else if test "$wxUSE_THREADS" = "yes" ; then case "${host}" in - x86_64-*-mingw32* ) + x86_64-*-mingw* ) ;; *-*-mingw32* ) dnl check if the compiler accepts -mthreads From e2a78115dd17916932f0d9873d65bd7417512204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:31:09 +0300 Subject: [PATCH 04/13] under Windows use win format for pwd and custom paths, required by ar and ld --- configure | 2 +- configure.in | 2 +- docs/qt/install.txt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1cf0f4cc0d..c2e5e36448 100755 --- a/configure +++ b/configure @@ -3785,7 +3785,7 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number -wx_top_builddir="`pwd`" +wx_top_builddir="`pwd -W 2> /dev/null || pwd`" diff --git a/configure.in b/configure.in index 9a52cc508c..fab6de0bdb 100644 --- a/configure.in +++ b/configure.in @@ -52,7 +52,7 @@ WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_numbe dnl Autoconf-2.60 changed the meaning of top_builddir variable, so we have dnl to use our own replacement that will work with both 2.5x and 2.60+: -wx_top_builddir="`pwd`" +wx_top_builddir="`pwd -W 2> /dev/null || pwd`" AC_SUBST(wx_top_builddir) diff --git a/docs/qt/install.txt b/docs/qt/install.txt index c3868ab6c7..f53c602b8c 100644 --- a/docs/qt/install.txt +++ b/docs/qt/install.txt @@ -104,7 +104,8 @@ to configure the Qt dir of the build intended to use as QT5_CUSTOM_DIR, i.e. ../configure --with-qt --enable-debug QT5_CUSTOM_DIR=~/Qt/5.11.0/gcc_64 # for Windows (ran from Git Bash, or any other Unix-like shell): -../configure --with-qt --enable-debug QT5_CUSTOM_DIR=/c/Qt/5.11.0/mingw53_32 +# (the syntax for the drive in the path is required by ar and ld) +../configure --with-qt --enable-debug QT5_CUSTOM_DIR=c:/Qt/5.11.0/mingw53_32 * Building wxGT on Android -------------------------- From 97c9f7599d21c26138ac69ef2fe24c344b0d7619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:33:57 +0300 Subject: [PATCH 05/13] removed leading spaces of a code line --- include/wx/evtloop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 5d6f7cf65b..223dee060c 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -296,7 +296,7 @@ private: #include "wx/dfb/evtloop.h" #elif defined(__WXGTK20__) #include "wx/gtk/evtloop.h" - #elif defined(__WXQT__) +#elif defined(__WXQT__) #include "wx/qt/evtloop.h" #else // other platform From f1bfa20fcad19f052c9fbce2fbd8da34c9f72083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:36:59 +0300 Subject: [PATCH 06/13] DLL import fix for wxTaskBarIcon under QT --- include/wx/qt/taskbar.h | 2 +- src/qt/taskbar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/qt/taskbar.h b/include/wx/qt/taskbar.h index 5de2f084b8..6ac90e6f71 100644 --- a/include/wx/qt/taskbar.h +++ b/include/wx/qt/taskbar.h @@ -10,7 +10,7 @@ class QSystemTrayIcon; -class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase +class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase { public: wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); diff --git a/src/qt/taskbar.cpp b/src/qt/taskbar.cpp index b375afd79f..ff6b9f8256 100644 --- a/src/qt/taskbar.cpp +++ b/src/qt/taskbar.cpp @@ -21,7 +21,7 @@ bool wxTaskBarIconBase::IsAvailable() //============================================================================= -wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxTaskBarIconBase); +wxIMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler); wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType)) { From aa2d2aa761e0435d1908428183f97d9e9fc198c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:40:00 +0300 Subject: [PATCH 07/13] isolate Unix-only code with if guards --- src/qt/sockqt.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qt/sockqt.cpp b/src/qt/sockqt.cpp index 09fa8d9584..239b4bfed6 100644 --- a/src/qt/sockqt.cpp +++ b/src/qt/sockqt.cpp @@ -94,10 +94,12 @@ public: wxVector m_qtNotifiers; }; +#if defined(__UNIX__) wxFDIOManager *wxGUIAppTraits::GetFDIOManager() { static QtFDIOManager s_manager; return &s_manager; } +#endif // __UNIX__ -#endif // wxUSE_SOCKETS && __UNIX__ +#endif // wxUSE_SOCKETS From ee8ab1b9aacd55f9752983a707727fbc6453b6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:41:36 +0300 Subject: [PATCH 08/13] use the generic implementation of wxDoLaunchDefaultBrowser under wxQT --- src/common/utilscmn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index bae186b759..f18f5f1fb2 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1037,7 +1037,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) // Launch default browser // ---------------------------------------------------------------------------- -#if defined(__WINDOWS__) || \ +#if defined(__WINDOWS__) && !defined(__WXQT__) || \ defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || \ defined(__WXOSX__) From 7ec3a14c9a76eb4fe82af164c764b23502abd523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:43:50 +0300 Subject: [PATCH 09/13] do not allow HAS_LOAD_FROM_RESOURCE for wxQT, at least for now --- src/common/image.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/image.cpp b/src/common/image.cpp index 846eeee64f..fd03e042a6 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -2481,7 +2481,8 @@ int wxImage::GetLoadFlags() const // Under Windows we can load wxImage not only from files but also from // resources. -#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE +#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE \ +&& !defined(__WXQT__) // undefined reference to `wxDIB::ConvertToImage(wxDIB::ConversionFlags) const' #define HAS_LOAD_FROM_RESOURCE #endif From 5adc65d0855a20d1fa849243d8720cdb2c9d7068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:48:19 +0300 Subject: [PATCH 10/13] do not define __WXMSW__ and __WXQT__ at the same time --- include/wx/platform.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/platform.h b/include/wx/platform.h index 9e67fc7d76..45bb9cc3aa 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -81,7 +81,7 @@ #if defined(__WINDOWS__) /* Select wxMSW under Windows if no other port is specified. */ -# if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) +# if !defined(__WXMSW__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXQT__) # define __WXMSW__ # endif @@ -122,13 +122,13 @@ # endif #endif -#if defined(__WXGTK__) && defined(__WINDOWS__) +#if (defined(__WXGTK__) || defined(__WXQT__)) && defined(__WINDOWS__) # ifdef __WXMSW__ # undef __WXMSW__ # endif -#endif /* __WXGTK__ && __WINDOWS__ */ +#endif /* (__WXGTK__ || __WXQT__) && __WINDOWS__ */ #ifdef __ANDROID__ # define __WXANDROID__ From 88734cb6d7a23b758c79360816c4ee61f65fce6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:53:54 +0300 Subject: [PATCH 11/13] wxQT Windows build fix, rather incorrect --- src/msw/basemsw.cpp | 1 + src/qt/apptraits.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp index 3204e02154..5cf06c48b6 100644 --- a/src/msw/basemsw.cpp +++ b/src/msw/basemsw.cpp @@ -86,6 +86,7 @@ wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer) #endif // wxUSE_TIMER +// Why can't this be disabled for __WXQT__ ??? There is an implementation in src/qt/apptraits.cpp wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() { #if wxUSE_CONSOLE_EVENTLOOP diff --git a/src/qt/apptraits.cpp b/src/qt/apptraits.cpp index 1f1553f6c0..3f44fd8f8e 100644 --- a/src/qt/apptraits.cpp +++ b/src/qt/apptraits.cpp @@ -56,7 +56,8 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, //############################################################################# -#if wxUSE_CONSOLE_EVENTLOOP +// this one fails to link under Windows; why is src/msw/basemsw.cpp picked up??? +#if wxUSE_CONSOLE_EVENTLOOP && !defined(__WINDOWS__) wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop() { From cdaf3d12ebe53e97344f766b92555a4ddd7e93d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:56:41 +0300 Subject: [PATCH 12/13] added wxQT declaration of wxGUIAppTraits --- include/wx/msw/apptrait.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h index b818a132a0..4d6c29abc4 100644 --- a/include/wx/msw/apptrait.h +++ b/include/wx/msw/apptrait.h @@ -87,6 +87,31 @@ public: virtual bool WriteToStderr(const wxString& WXUNUSED(text)) { return false; } }; +#elif defined(__WXQT__) + +class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase +{ +public: + virtual wxEventLoopBase *CreateEventLoop(); + virtual void *BeforeChildWaitLoop() { return NULL; } + virtual void AfterChildWaitLoop(void*) { } +#if wxUSE_TIMER + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); +#endif + +#if wxUSE_THREADS + virtual bool DoMessageFromThreadWait() { return true; } + virtual WXDWORD WaitForThread(WXHANDLE hThread, int WXUNUSED(flags)) + { return DoSimpleWaitForThread(hThread); } +#endif // wxUSE_THREADS + virtual wxPortId GetToolkitVersion(int *majVer = NULL, + int *minVer = NULL, + int *microVer = NULL) const; + + virtual bool CanUseStderr() { return false; } + virtual bool WriteToStderr(const wxString&) { return false; } +}; + #endif #endif // wxUSE_GUI From 5349d48c386c0c9c6c7982fea7a635cf228c47c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Sun, 5 Aug 2018 15:46:50 +0300 Subject: [PATCH 13/13] dll build fix for WXQT, DoEnableSystemTheme removing 'inline' did fix: warning: 'virtual void wxSystemThemedControlBase::DoEnableSystemTheme(bool, wxWindow*)' redeclared without dllimport attribute after being referenced with dll linkage but introduced multiple definition of `wxSystemThemedControlBase::DoEnableSystemTheme(bool, wxWindow*)'. The proposed form gets no complaints --- include/wx/systhemectrl.h | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/include/wx/systhemectrl.h b/include/wx/systhemectrl.h index 0b9a9ab6ba..8af2d5d9c1 100644 --- a/include/wx/systhemectrl.h +++ b/include/wx/systhemectrl.h @@ -12,6 +12,10 @@ #include "wx/defs.h" +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #define wxHAS_SYSTEM_THEMED_CONTROL +#endif + class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_CORE wxSystemThemedControlBase @@ -24,7 +28,13 @@ public: protected: // This method is virtual and can be overridden, e.g. composite controls do // it to enable the system theme for all of their parts. - virtual void DoEnableSystemTheme(bool enable, wxWindow* window); + virtual void DoEnableSystemTheme +#ifdef wxHAS_SYSTEM_THEMED_CONTROL + // Only __WXMSW__ has a non-trivial implementation currently. + (bool enable, wxWindow* window); +#else + (bool WXUNUSED(enable), wxWindow* WXUNUSED(window)) { } +#endif // wxHAS_SYSTEM_THEMED_CONTROL wxDECLARE_NO_COPY_CLASS(wxSystemThemedControlBase); }; @@ -47,20 +57,4 @@ protected: wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSystemThemedControl, C); }; -// Only __WXMSW__ has a non-trivial implementation currently. -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #define wxHAS_SYSTEM_THEMED_CONTROL -#endif - -#ifndef wxHAS_SYSTEM_THEMED_CONTROL - -inline void -wxSystemThemedControlBase::DoEnableSystemTheme(bool WXUNUSED(enable), - wxWindow* WXUNUSED(window)) -{ - // Nothing to do. -} - -#endif // !wxHAS_SYSTEM_THEMED_CONTROL - #endif // _WX_SYSTHEMECTRL_H