diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 07:34:16 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 07:34:29 +0000 |
| commit | b40c8769f2e4fb589de2263b7d8088d0c69ae6e3 (patch) | |
| tree | 22c6eacfdac15bf24efde50cee4af7d9af38698b /kBuild/units/qt6.kmk | |
| parent | Releasing progress-linux version 1:0.1.9998svn3589+dfsg-1~progress7.99u1. (diff) | |
| download | kbuild-b40c8769f2e4fb589de2263b7d8088d0c69ae6e3.tar.xz kbuild-b40c8769f2e4fb589de2263b7d8088d0c69ae6e3.zip | |
Merging upstream version 1:0.1.9998svn3604+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'kBuild/units/qt6.kmk')
| -rw-r--r-- | kBuild/units/qt6.kmk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kBuild/units/qt6.kmk b/kBuild/units/qt6.kmk index fc3d91c..28d6100 100644 --- a/kBuild/units/qt6.kmk +++ b/kBuild/units/qt6.kmk @@ -1,4 +1,4 @@ -# $Id: qt6.kmk 3559 2022-03-02 01:47:27Z bird $ +# $Id: qt6.kmk 3593 2023-05-19 10:39:04Z bird $ ## @file # Qt 6 unit. # @@ -1130,9 +1130,6 @@ ifeq ($(bld_trg),darwin) else ifeq ($(bld_trg),win) $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT6_LIB)/$(qt_prefix)Qt6$(module)$(qt_infix)$(SUFF_LIB)) ) - ifeq ($(tool_do),LINK_PROGRAM) - $(eval $(target)_LIBS += $(PATH_SDK_QT6_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) - endif else $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT6_LIB)/lib$(qt_prefix)Qt6$(module)$(qt_infix)$(SUFF_DLL)) ) endif |