32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
|
diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk
|
||
|
|
index 71b96a3..73391f0 100644
|
||
|
|
--- a/kBuild/units/qt5.kmk
|
||
|
|
+++ b/kBuild/units/qt5.kmk
|
||
|
|
@@ -994,9 +994,10 @@ else
|
||
|
|
$(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) )
|
||
|
|
endif
|
||
|
|
else
|
||
|
|
- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) )
|
||
|
|
+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \
|
||
|
|
+ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL))
|
||
|
|
endif
|
||
|
|
- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) )
|
||
|
|
+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras )
|
||
|
|
endif
|
||
|
|
$(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
|
||
|
|
|
||
|
|
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
|
||
|
|
index 38db6b0..7dd446b 100644
|
||
|
|
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
|
||
|
|
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
|
||
|
|
@@ -912,9 +912,6 @@ VirtualBox_QT_MODULES = Core Gui
|
||
|
|
ifdef VBOX_WITH_QTGUI_V5
|
||
|
|
# Qt5 requires additional modules:
|
||
|
|
VirtualBox_QT_MODULES += Widgets PrintSupport
|
||
|
|
- VirtualBox_QT_MODULES.linux += X11Extras
|
||
|
|
- VirtualBox_QT_MODULES.solaris += X11Extras
|
||
|
|
- VirtualBox_QT_MODULES.freebsd += X11Extras
|
||
|
|
VirtualBox_QT_MODULES.darwin += MacExtras
|
||
|
|
VirtualBox_QT_MODULES.win += WinExtras
|
||
|
|
endif # VBOX_WITH_QTGUI_V5
|