at 18.03-beta 31 lines 1.7 kB view raw
1diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk 2index 71b96a3..73391f0 100644 3--- a/kBuild/units/qt5.kmk 4+++ b/kBuild/units/qt5.kmk 5@@ -1019,9 +1019,10 @@ else 6 $(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) 7 endif 8 else 9- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) 10+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \ 11+ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL)) 12 endif 13- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) ) 14+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) 15 endif 16 $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) 17 18diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk 19index 3295bfefe7..796370623c 100644 20--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk 21+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk 22@@ -916,9 +916,6 @@ endif 23 # The Qt modules we're using. 24 # (The include directory and lib/framework for each module will be added by the Qt unit.) 25 VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport 26-VirtualBox_QT_MODULES.linux += X11Extras 27-VirtualBox_QT_MODULES.solaris += X11Extras 28-VirtualBox_QT_MODULES.freebsd += X11Extras 29 VirtualBox_QT_MODULES.darwin += MacExtras 30 VirtualBox_QT_MODULES.win += WinExtras 31 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)