Skip to content

Commit dd64164

Browse files
cprocchelmuth
cproc
authored and
chelmuth
committed
qt6: split port into modules
Fixes #5402
1 parent d3002b2 commit dd64164

File tree

39 files changed

+174
-68
lines changed

39 files changed

+174
-68
lines changed

‎repos/libports/lib/import/import-qt6.inc

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ $(error Error: unsupported platform)
1313
endif
1414

1515
ifeq ($(CONTRIB_DIR),)
16-
QT_DIR = $(call select_from_repositories,src/lib/qt6)
17-
QT_API_DIR = $(call select_from_repositories,mkspecs)/..
16+
QT_API_DIR = $(abspath $(call select_from_repositories,lib/import/import-qt6.inc)/../../..)
1817
abi_symbol_path = $(wildcard $(call select_from_repositories,lib/symbols/$1))
1918
else
20-
QT_PORT_DIR := $(call select_from_ports,qt6)
21-
QT_DIR = $(QT_PORT_DIR)/src/lib/qt6
22-
QT_API_DIR = $(QT_DIR)/genode/api
19+
QT_API_PORT_DIR := $(call select_from_ports,qt6_api)
20+
QT_API_DIR = $(QT_API_PORT_DIR)/src/lib/qt6_api
2321
abi_symbol_path = $(wildcard $(addprefix $(QT_API_DIR)/lib/symbols/,$1))
2422
endif
2523

‎repos/libports/ports/qt6.hash

-1
This file was deleted.

‎repos/libports/ports/qt6.port

-8
This file was deleted.

‎repos/libports/ports/qt6_api.hash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f1114bb5e6cdf5a3dcb071e067d8ef16b05b3e28

‎repos/libports/ports/qt6_api.port

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
LICENSE := LGPL
2+
VERSION := 6.6.2
3+
4+
DOWNLOADS := qt6_api.git
5+
6+
URL(qt6_api) := https://github.com/cproc/qt6_api.git
7+
REV(qt6_api) := issue5402
8+
DIR(qt6_api) := src/lib/qt6_api

‎repos/libports/ports/qt6_base.hash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c646a46cfe1589a347d520bbbabbbd09d02d2fc2

‎repos/libports/ports/qt6_base.port

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
LICENSE := LGPL
2+
VERSION := 6.6.2
3+
4+
DOWNLOADS := qt6_base.git
5+
6+
URL(qt6_base) := https://github.com/cproc/qt6_base.git
7+
REV(qt6_base) := issue5402
8+
DIR(qt6_base) := src/lib/qt6_base

‎repos/libports/ports/qt6_declarative.hash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2bcee8ddd2456a084c91e32d01387fa7392d3997

‎repos/libports/ports/qt6_declarative.port

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
LICENSE := LGPL
2+
VERSION := 6.6.2
3+
4+
DOWNLOADS := qt6_declarative.git
5+
6+
URL(qt6_declarative) := https://github.com/cproc/qt6_declarative.git
7+
REV(qt6_declarative) := issue5402
8+
DIR(qt6_declarative) := src/lib/qt6_declarative

‎repos/libports/ports/qt6_shadertools.hash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ec9f67054cfafae32e1e811a738f9a0ae2f333d1

‎repos/libports/ports/qt6_shadertools.port

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
LICENSE := LGPL
2+
VERSION := 6.6.2
3+
4+
DOWNLOADS := qt6_shadertools.archive
5+
6+
URL(qt6_shadertools) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz
7+
SHA(qt6_shadertools) := 628bead7ff4e7f42cb910f47d2adefbdea0d8c71a0234baef8ca709bf467b92f
8+
DIR(qt6_shadertools) := src/lib/qt6_shadertools

‎repos/libports/ports/qt6_svg.hash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
30ec422bd2a6d26bd70a4e9d609a53e0cd45392d

‎repos/libports/ports/qt6_svg.port

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
LICENSE := LGPL
2+
VERSION := 6.6.2
3+
4+
DOWNLOADS := qt6_svg.archive
5+
6+
URL(qt6_svg) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz
7+
SHA(qt6_svg) := 5a231d59ef1b42bfbaa5174d4ff39f8e1b4ba070ef984a70b069b4b2576d8181
8+
DIR(qt6_svg) := src/lib/qt6_svg

‎repos/libports/ports/qt6_tools.hash

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
178b2eaa49d51ac12313e755a2cb51957256cbfb

‎repos/libports/ports/qt6_tools.port

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
LICENSE := LGPL
2+
VERSION := 6.6.2
3+
4+
DOWNLOADS := qt6_tools.archive
5+
6+
URL(qt6_tools) := https://download.qt.io/archive/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz
7+
SHA(qt6_tools) := e6d49e9f52111287f77878ecb8b708cce682f10b03ba2476d9247603bc6c4746
8+
DIR(qt6_tools) := src/lib/qt6_tools

‎repos/libports/recipes/api/qt6_base/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ content: $(MIRROR_FROM_REP_DIR)
99
$(MIRROR_FROM_REP_DIR):
1010
$(mirror_from_rep_dir)
1111

12-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
13-
API_DIR := $(PORT_DIR)/src/lib/qt6/genode/api
12+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
13+
API_DIR := $(PORT_DIR)/src/lib/qt6_api
1414

1515
MIRROR_FROM_PORT_DIR := include \
1616
metatypes \
@@ -45,4 +45,4 @@ $(MIRROR_SYMBOLS):
4545
content: LICENSE
4646

4747
LICENSE:
48-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
48+
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

‎repos/libports/recipes/api/qt6_declarative/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
1+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
22

33
MIRROR_LIB_SYMBOLS := libQt6LabsAnimation \
44
libQt6LabsFolderListModel \
@@ -31,9 +31,9 @@ content: $(MIRROR_LIB_SYMBOLS)
3131

3232
$(MIRROR_LIB_SYMBOLS):
3333
mkdir -p lib/symbols
34-
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
34+
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/
3535

3636
content: LICENSE
3737

3838
LICENSE:
39-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
39+
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

‎repos/libports/recipes/api/qt6_shadertools/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
1+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
22

33
MIRROR_LIB_SYMBOLS := libQt6ShaderTools
44

55
content: $(MIRROR_LIB_SYMBOLS)
66

77
$(MIRROR_LIB_SYMBOLS):
88
mkdir -p lib/symbols
9-
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
9+
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/
1010

1111
content: LICENSE
1212

1313
LICENSE:
14-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
14+
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

‎repos/libports/recipes/api/qt6_svg/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
1+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_api)
22

33
MIRROR_LIB_SYMBOLS := libQt6Svg
44

55
content: $(MIRROR_LIB_SYMBOLS)
66

77
$(MIRROR_LIB_SYMBOLS):
88
mkdir -p lib/symbols
9-
cp $(PORT_DIR)/src/lib/qt6/genode/api/lib/symbols/$@ lib/symbols/
9+
cp $(PORT_DIR)/src/lib/qt6_api/lib/symbols/$@ lib/symbols/
1010

1111
content: LICENSE
1212

1313
LICENSE:
14-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
14+
cp $(PORT_DIR)/src/lib/qt6_api/LICENSE.LGPL3 $@

‎repos/libports/recipes/raw/qt6_dejavusans/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
content: qt6_dejavusans.tar LICENSE
22

3-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
3+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
44

55
qt/lib/fonts/DejaVuSans.ttf:
66
mkdir -p $(dir $@)
7-
cp $(PORT_DIR)/src/lib/qt6/qtbase/src/3rdparty/wasm/$(notdir $@) $@
7+
cp $(PORT_DIR)/src/lib/qt6_base/src/3rdparty/wasm/$(notdir $@) $@
88

99
qt6_dejavusans.tar: qt/lib/fonts/DejaVuSans.ttf
1010
tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt
1111
rm -rf qt
1212

1313
LICENSE:
14-
cp $(PORT_DIR)/src/lib/qt6/qtbase/src/3rdparty/wasm/DEJAVU-LICENSE $@
14+
cp $(PORT_DIR)/src/lib/qt6_base/src/3rdparty/wasm/DEJAVU-LICENSE $@

‎repos/libports/recipes/raw/qt6_samegame/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
content: qt6_samegame.tar
22

3-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
3+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_declarative)
44

55
SAMEGAME3_RESOURCES := samegame.qml \
66
Dialog.qml \
@@ -20,10 +20,10 @@ samegame/pics:
2020
mkdir -p $@
2121

2222
$(addprefix samegame/, $(SAMEGAME3_RESOURCES)): samegame
23-
cp $(PORT_DIR)/src/lib/qt6/qtdeclarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@
23+
cp $(PORT_DIR)/src/lib/qt6_declarative/examples/quick/tutorials/samegame/samegame3/$(notdir $@) $@
2424

2525
$(addprefix samegame/pics/, $(SAMEGAME_RESOURCES)): samegame/pics
26-
cp $(PORT_DIR)/src/lib/qt6/qtdeclarative/examples/quick/tutorials/samegame/samegame3/pics/$(notdir $@) $@
26+
cp $(PORT_DIR)/src/lib/qt6_declarative/examples/quick/tutorials/samegame/samegame3/pics/$(notdir $@) $@
2727

2828

2929
qt6_samegame.tar: $(addprefix samegame/, $(SAMEGAME3_RESOURCES)) \

‎repos/libports/recipes/src/qt6_base/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_base
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -26,4 +26,4 @@ $(MIRROR_FROM_OS):
2626
content: LICENSE
2727

2828
LICENSE:
29-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
29+
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/LGPL-3.0-only.txt $@

‎repos/libports/recipes/src/qt6_calculatorform/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_tools)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qttools/examples/designer/calculatorform
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_tools/examples/designer/calculatorform
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
1616
cp -r $(PORT_DIR)/$@ $(dir $@)
1717

1818
LICENSE:
19-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
19+
cp $(PORT_DIR)/src/lib/qt6_tools/LICENSES/GPL-3.0-only.txt $@
2020

‎repos/libports/recipes/src/qt6_declarative/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_declarative)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtdeclarative
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_declarative
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
1818
content: LICENSE
1919

2020
LICENSE:
21-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
21+
cp $(PORT_DIR)/src/lib/qt6_declarative/LICENSES/LGPL-3.0-only.txt $@

‎repos/libports/recipes/src/qt6_openglwindow/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/examples/opengl/openglwindow
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/examples/opengl/openglwindow
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
1616
cp -r $(PORT_DIR)/$@ $(dir $@)
1717

1818
LICENSE:
19-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
19+
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@
2020

‎repos/libports/recipes/src/qt6_shadertools/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_shadertools)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtshadertools
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_shadertools
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
1818
content: LICENSE
1919

2020
LICENSE:
21-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
21+
cp $(PORT_DIR)/src/lib/qt6_shadertools/LICENSES/LGPL-3.0-only.txt $@

‎repos/libports/recipes/src/qt6_svg/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR)
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_svg)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtsvg
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_svg
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -18,4 +18,4 @@ $(MIRROR_FROM_PORT_DIR):
1818
content: LICENSE
1919

2020
LICENSE:
21-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.LGPL3 $@
21+
cp $(PORT_DIR)/src/lib/qt6_svg/LICENSES/LGPL-3.0-only.txt $@

‎repos/libports/recipes/src/qt6_testqstring/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/examples/qtestlib/tutorial1
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/examples/qtestlib/tutorial1
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
1616
cp -r $(PORT_DIR)/$@ $(dir $@)
1717

1818
LICENSE:
19-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
19+
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@
2020

‎repos/libports/recipes/src/qt6_tetrix/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/tests/manual/examples/widgets/widgets/tetrix
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/tests/manual/examples/widgets/widgets/tetrix
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -16,4 +16,4 @@ $(MIRROR_FROM_PORT_DIR):
1616
cp -r $(PORT_DIR)/$@ $(dir $@)
1717

1818
LICENSE:
19-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
19+
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@

‎repos/libports/recipes/src/qt6_textedit/content.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ content: $(MIRROR_FROM_REP_DIR) LICENSE
55
$(MIRROR_FROM_REP_DIR):
66
$(mirror_from_rep_dir)
77

8-
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6)
8+
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt6_base)
99

10-
MIRROR_FROM_PORT_DIR := src/lib/qt6/qtbase/tests/manual/examples/widgets/richtext/textedit
10+
MIRROR_FROM_PORT_DIR := src/lib/qt6_base/tests/manual/examples/widgets/richtext/textedit
1111

1212
content: $(MIRROR_FROM_PORT_DIR)
1313

@@ -16,5 +16,5 @@ $(MIRROR_FROM_PORT_DIR):
1616
cp -r $(PORT_DIR)/$@ $(dir $@)
1717

1818
LICENSE:
19-
cp $(PORT_DIR)/src/lib/qt6/LICENSE.GPL3 $@
19+
cp $(PORT_DIR)/src/lib/qt6_base/LICENSES/GPL-3.0-only.txt $@
2020

‎repos/libports/src/app/qt6/examples/calculatorform/target.mk

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
QMAKE_PROJECT_FILE = $(QT_DIR)/qttools/examples/designer/calculatorform/calculatorform.pro
1+
ifeq ($(CONTRIB_DIR),)
2+
QT6_TOOLS_DIR = $(call select_from_repositories,src/lib/qt6_tools)
3+
else
4+
QT6_TOOLS_PORT_DIR := $(call select_from_ports,qt6_tools)
5+
QT6_TOOLS_DIR = $(QT6_TOOLS_PORT_DIR)/src/lib/qt6_tools
6+
endif
7+
8+
QMAKE_PROJECT_FILE = $(QT6_TOOLS_DIR)/examples/designer/calculatorform/calculatorform.pro
29

310
QMAKE_TARGET_BINARIES = calculatorform
411

‎repos/libports/src/app/qt6/examples/openglwindow/target.mk

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
QMAKE_PROJECT_FILE = $(QT_DIR)/qtbase/examples/opengl/openglwindow/openglwindow.pro
1+
ifeq ($(CONTRIB_DIR),)
2+
QT6_BASE_DIR = $(call select_from_repositories,src/lib/qt6_base)
3+
else
4+
QT6_BASE_PORT_DIR := $(call select_from_ports,qt6_base)
5+
QT6_BASE_DIR = $(QT6_BASE_PORT_DIR)/src/lib/qt6_base
6+
endif
7+
8+
QMAKE_PROJECT_FILE = $(QT6_BASE_DIR)/examples/opengl/openglwindow/openglwindow.pro
29

310
QMAKE_TARGET_BINARIES = openglwindow
411

0 commit comments

Comments
 (0)