This adds the capability to build qt from the git super project. I
replaced the '-release' with '-developer-build' since building from git
is only useful for developers which often need more debug information.
The qtpim and qtdocgallery packages are only available on the qt5
git super project. The release tar doesn't contain those modules yet.
Anyway, those modules can't be compiled yet so we need to skip those.
Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
rules/qt5.in | 15 +++++++++++++++
rules/qt5.make | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/rules/qt5.in b/rules/qt5.in
index b5b6e2bfb..40380feaa 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -87,6 +87,11 @@ config QT5_LIBXKBCOMMON
bool
default QT5_PLATFORM_XCB || QT5_MODULE_QTWAYLAND || QT5_INPUT_LIBINPUT
+config QT5_DEVEL_BUILD
+ bool
+ default n
+ prompt "Enable developer build"
+
if QT5_PLATFORM_XCB
config QT5_X11
@@ -711,6 +716,16 @@ config QT5_MODULE_QTXMLPATTERNS
bool
prompt "QtXmlPatterns"
+config QT5_MODULE_QTPIM
+ bool
+ depends on BROKEN
+ prompt "QtPim"
+
+config QT5_MODULE_QTDOCGALLERY
+ bool
+ depends on BROKEN
+ prompt "QtDocGallery"
+
endmenu
endif
diff --git a/rules/qt5.make b/rules/qt5.make
index e70fefe25..5f8ccb9e3 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -112,7 +112,7 @@ QT5_CONF_OPT := \
$(if $(filter 1,$(PTXDIST_VERBOSE)),-v) \
-opensource \
-confirm-license \
- -release \
+ $(call ptx/ifdef, PTXCONF_QT5_DEVEL_BUILD, -developer-build, -release) \
--disable-optimized-tools \
--disable-separate-debug-info \
--disable-gdb-index \
@@ -140,6 +140,7 @@ QT5_CONF_OPT := \
$(call ptx/qt5-module, QTDATAVIS3D, qtdatavis3d) \
$(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \
-skip qtdoc \
+ $(call ptx/qt5-module, QTDOCGALLERY, qtdocgallery) \
$(call ptx/qt5-module, QTGAMEPAD, qtgamepad) \
$(call ptx/qt5-module, QTGRAPHICALEFFECTS, qtgraphicaleffects) \
$(call ptx/qt5-module, QTIMAGEFORMATS, qtimageformats) \
@@ -147,6 +148,7 @@ QT5_CONF_OPT := \
-skip qtmacextras \
$(call ptx/qt5-module, QTMULTIMEDIA, qtmultimedia) \
$(call ptx/qt5-module, QTNETWORKAUTH, qtnetworkauth) \
+ $(call ptx/qt5-module, QTPIM, qtpim) \
$(call ptx/qt5-module, QTPURCHASING, qtpurchasing) \
$(call ptx/qt5-module, QT3D_QUICK, qtquick3d) \
$(call ptx/qt5-module, QTQUICKCONTROLS, qtquickcontrols) \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
