diff --git a/Makefile.in b/Makefile.in
index e1acf62abe..57f68c1d66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3418,7 +3418,8 @@ COND_TOOLKIT_QT_ADVANCED_PLATFORM_HDR = \
wx/qt/dataview.h \
wx/qt/dvrenderer.h \
wx/qt/dvrenderers.h \
- wx/qt/taskbar.h
+ wx/qt/taskbar.h \
+ wx/generic/activityindicator.h
@COND_TOOLKIT_QT@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_QT_ADVANCED_PLATFORM_HDR)
@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
@@ -5922,7 +5923,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_unix_sound.o \
monodll_qt_taskbar.o \
monodll_taskbarcmn.o \
- monodll_qt_utils.o
+ monodll_qt_utils.o \
+ monodll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
@@ -6038,7 +6040,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
monodll_unix_sound.o \
monodll_qt_taskbar.o \
monodll_taskbarcmn.o \
- monodll_qt_utils.o
+ monodll_qt_utils.o \
+ monodll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_1)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
monodll_taskbarcmn.o \
@@ -7930,7 +7933,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
monolib_unix_sound.o \
monolib_qt_taskbar.o \
monolib_taskbarcmn.o \
- monolib_qt_utils.o
+ monolib_qt_utils.o \
+ monolib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_2)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
monolib_taskbarcmn.o \
@@ -8046,7 +8050,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
monolib_unix_sound.o \
monolib_qt_taskbar.o \
monolib_taskbarcmn.o \
- monolib_qt_utils.o
+ monolib_qt_utils.o \
+ monolib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_3)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
monolib_taskbarcmn.o \
@@ -11619,7 +11624,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \
advdll_unix_sound.o \
advdll_qt_taskbar.o \
advdll_taskbarcmn.o \
- advdll_utils.o
+ advdll_utils.o \
+ advdll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_4 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_4)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_4 = \
advdll_taskbarcmn.o \
@@ -11735,7 +11741,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
advdll_unix_sound.o \
advdll_qt_taskbar.o \
advdll_taskbarcmn.o \
- advdll_utils.o
+ advdll_utils.o \
+ advdll_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_5 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_5)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
advdll_taskbarcmn.o \
@@ -11918,7 +11925,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \
advlib_unix_sound.o \
advlib_qt_taskbar.o \
advlib_taskbarcmn.o \
- advlib_utils.o
+ advlib_utils.o \
+ advlib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_6 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_6)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_6 = \
advlib_taskbarcmn.o \
@@ -12034,7 +12042,8 @@ COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
advlib_unix_sound.o \
advlib_qt_taskbar.o \
advlib_taskbarcmn.o \
- advlib_utils.o
+ advlib_utils.o \
+ advlib_generic_activityindicator.o
@COND_TOOLKIT_QT@__ADVANCED_PLATFORM_SRC_OBJECTS_7 = $(COND_TOOLKIT_QT___ADVANCED_PLATFORM_SRC_OBJECTS_7)
COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
advlib_taskbarcmn.o \
@@ -19917,6 +19926,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
@COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
@@ -24741,6 +24753,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+@COND_TOOLKIT_QT_USE_GUI_1@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_QT_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
@COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
@@ -33207,6 +33222,9 @@ advdll_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+@COND_TOOLKIT_QT@advdll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
@COND_TOOLKIT_MSW@advdll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
@@ -33657,6 +33675,9 @@ advlib_notifmsgcmn.o: $(srcdir)/src/common/notifmsgcmn.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+@COND_TOOLKIT_QT@advlib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_QT@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
+
@COND_TOOLKIT_MSW@advlib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 9e673e3892..4d2a3986a7 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -788,12 +788,6 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
- COND_TOOLKIT_MSW_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_MSW_WXUNIV_0=""
- fi
- AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal-mariano/minimal.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl] ###
COND_TOOLKIT_OSX_CARBON="#"
if test "x$TOOLKIT" = "xOSX_CARBON" ; then
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 891c6f71dd..98b0d840da 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -416,6 +416,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/dvrenderer.h
wx/qt/dvrenderers.h
wx/qt/taskbar.h
+ wx/generic/activityindicator.h
@@ -430,6 +431,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/taskbar.cpp
src/common/taskbarcmn.cpp
src/qt/utils.cpp
+ src/generic/activityindicator.cpp
diff --git a/build/files b/build/files
index ff0020cff8..216467bc67 100644
--- a/build/files
+++ b/build/files
@@ -179,6 +179,205 @@ BASE_OSX_NOTWXMAC_HDR =
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
$(BASE_COREFOUNDATION_HDR)
+
+## Qt
+
+QT_LOWLEVEL_HDR =
+ wx/qt/accel.h
+ wx/qt/app.h
+ wx/qt/apptbase.h
+ wx/qt/apptrait.h
+ wx/qt/bitmap.h
+ wx/qt/bmpbuttn.h
+ wx/qt/brush.h
+ wx/qt/anybutton.h
+ wx/qt/button.h
+ wx/qt/checkbox.h
+ wx/qt/checklst.h
+ wx/qt/choice.h
+ wx/qt/clipbrd.h
+ wx/qt/clrpicker.h
+ wx/qt/generic/clrpickerg.h
+ wx/generic/collpaneg.h
+ wx/qt/colordlg.h
+ wx/qt/colour.h
+ wx/qt/combobox.h
+ wx/qt/control.h
+ wx/qt/converter.h
+ wx/qt/ctrlsub.h
+ wx/qt/cursor.h
+ wx/qt/dataform.h
+ wx/qt/dataobj2.h
+ wx/qt/dataobj.h
+ wx/qt/dcclient.h
+ wx/qt/dc.h
+ wx/qt/dcmemory.h
+ wx/qt/dcprint.h
+ wx/qt/dcscreen.h
+ wx/qt/defs.h
+ wx/qt/dialog.h
+ wx/qt/dirdlg.h
+ wx/qt/dnd.h
+ wx/qt/evtloop.h
+ wx/qt/filedlg.h
+ wx/qt/font.h
+ wx/qt/fontdlg.h
+ wx/qt/frame.h
+ wx/qt/gauge.h
+ wx/generic/icon.h
+ wx/generic/imaglist.h
+ wx/qt/listbox.h
+ wx/qt/listctrl.h
+ wx/qt/mdi.h
+ wx/qt/menu.h
+ wx/qt/menuitem.h
+ wx/qt/minifram.h
+ wx/qt/msgdlg.h
+ wx/qt/notebook.h
+ wx/qt/palette.h
+ wx/qt/pen.h
+ wx/qt/popupwin.h
+ wx/qt/printdlg.h
+ wx/generic/prntdlgg.h
+ wx/qt/printqt.h
+ wx/qt/radiobox.h
+ wx/qt/radiobut.h
+ wx/qt/region.h
+ wx/qt/scrolbar.h
+ wx/qt/slider.h
+ wx/qt/spinbutt.h
+ wx/qt/spinctrl.h
+ wx/qt/statbmp.h
+ wx/qt/statbox.h
+ wx/qt/statline.h
+ wx/qt/statusbar.h
+ wx/qt/stattext.h
+ wx/qt/textctrl.h
+ wx/qt/textdlg.h
+ wx/qt/textentry.h
+ wx/qt/tglbtn.h
+ wx/qt/timer.h
+ wx/qt/toolbar.h
+ wx/qt/tooltip.h
+ wx/qt/toplevel.h
+ wx/qt/utils.h
+ wx/qt/window.h
+ wx/qt/private/winevent.h
+
+QT_LOWLEVEL_SRC=
+ src/qt/accel.cpp
+ src/qt/app.cpp
+ src/qt/apptraits.cpp
+ src/qt/bitmap.cpp
+ src/qt/bmpbuttn.cpp
+ src/qt/brush.cpp
+ src/qt/anybutton.cpp
+ src/qt/button.cpp
+ src/generic/caret.cpp
+ src/qt/checkbox.cpp
+ src/qt/checklst.cpp
+ src/qt/choice.cpp
+ src/qt/clipbrd.cpp
+ src/qt/clrpicker.cpp
+ src/generic/clrpickerg.cpp
+ src/generic/collpaneg.cpp
+ src/qt/colordlg.cpp
+ src/qt/colour.cpp
+ src/qt/combobox.cpp
+ src/qt/control.cpp
+ src/qt/converter.cpp
+ src/qt/ctrlsub.cpp
+ src/qt/cursor.cpp
+ src/qt/dataobj.cpp
+ src/qt/dcclient.cpp
+ src/qt/dc.cpp
+ src/qt/dcmemory.cpp
+ src/qt/dcprint.cpp
+ 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
+ src/generic/fdrepdlg.cpp
+ src/qt/filedlg.cpp
+ src/generic/filepickerg.cpp
+ src/qt/font.cpp
+ src/qt/fontdlg.cpp
+ src/qt/fontutil.cpp
+ src/qt/fontenum.cpp
+ src/generic/fontpickerg.cpp
+ src/qt/frame.cpp
+ src/qt/gauge.cpp
+ src/generic/icon.cpp
+ src/generic/imaglist.cpp
+ src/qt/listbox.cpp
+ src/qt/listctrl.cpp
+ src/qt/mdi.cpp
+ src/qt/menu.cpp
+ src/qt/menuitem.cpp
+ src/qt/minifram.cpp
+ src/qt/msgdlg.cpp
+ src/qt/notebook.cpp
+ src/qt/palette.cpp
+ src/qt/pen.cpp
+ src/qt/popupwin.cpp
+ src/qt/printdlg.cpp
+ src/generic/prntdlgg.cpp
+ src/qt/printqt.cpp
+ src/qt/radiobox.cpp
+ src/qt/radiobut.cpp
+ src/qt/region.cpp
+ src/qt/scrolbar.cpp
+ src/qt/settings.cpp
+ src/qt/sockqt.cpp
+ src/qt/slider.cpp
+ src/qt/spinbutt.cpp
+ src/qt/spinctrl.cpp
+ src/qt/statbmp.cpp
+ src/qt/statbox.cpp
+ src/qt/statline.cpp
+ src/qt/stattext.cpp
+ src/qt/statusbar.cpp
+ src/qt/textctrl.cpp
+ src/qt/textentry.cpp
+ src/generic/textmeasure.cpp
+ src/qt/tglbtn.cpp
+ src/qt/timer.cpp
+ src/qt/toolbar.cpp
+ src/qt/tooltip.cpp
+ src/qt/toplevel.cpp
+ src/qt/uiaction.cpp
+ src/qt/utils.cpp
+ src/qt/window.cpp
+
+ADVANCED_QT_HDR=
+ wx/generic/activityindicator.h
+ wx/generic/animate.h
+ wx/qt/calctrl.h
+ wx/qt/dataview.h
+ wx/qt/dvrenderer.h
+ wx/qt/dvrenderers.h
+ wx/qt/taskbar.h
+
+ADVANCED_QT_SRC=
+ src/generic/activityindicator.cpp
+ src/generic/animateg.cpp
+ src/qt/calctrl.cpp
+ src/qt/converter.cpp
+ 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
+
+MEDIA_QT_SRC=
+ src/qt/mediactrl.cpp
+
## Common
BASE_CMN_SRC =
diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp
index c3d6261fcd..833d5c9f75 100644
--- a/src/qt/uiaction.cpp
+++ b/src/qt/uiaction.cpp
@@ -27,14 +27,14 @@
using namespace Qt;
using namespace QTest;
-// Apparently {mouse,key}Event() functions signature has changed somewhere
-// between Qt 5.3 and 5.5 as they're documented to take QWidget in the latter
-// but actually take QWindow in the former, so use this helper to hide the
-// difference.
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
-inline QWidget* argForEvents(QWidget* w) { return w; }
-#else
+// Apparently {mouse,key}Event() functions signature has changed from QWidget
+// to QWindow at some time during Qt5, but we don't know when exactly. We do
+// know that they take QWindow for 5.3 and, presumably, later versions (but not
+// for whichever version this code was originally written for).
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
inline QWindow* argForEvents(QWidget* w) { return w->windowHandle(); }
+#else
+inline QWidget* argForEvents(QWidget* w) { return w; }
#endif
static MouseButton ConvertMouseButton( int button )