diff --git a/repos/libports/lib/import/import-qt5_quickcontrols2.mk b/repos/libports/lib/import/import-qt5_quickcontrols2.mk new file mode 100644 index 0000000000..08c3f83b6b --- /dev/null +++ b/repos/libports/lib/import/import-qt5_quickcontrols2.mk @@ -0,0 +1,15 @@ +IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) + +include $(IMPORT_QT5_INC) + +ifeq ($(CONTRIB_DIR),) +QT5_QUICKCONTROLS2_INC_DIR := $(realpath $(call select_from_repositories,include/QtQuickControls2)/..) +else +QT5_QUICKCONTROLS2_INC_DIR := $(QT5_PORT_DIR)/include +endif + +QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR) +QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2 +QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2/$(QT_VERSION) +QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2/$(QT_VERSION)/QtQuickControls2 +QT5_INC_DIR += $(QT5_QUICKCONTROLS2_INC_DIR)/QtQuickControls2/$(QT_VERSION)/QtQuickControls2/private diff --git a/repos/libports/lib/import/import-qt5_quicktemplates2.mk b/repos/libports/lib/import/import-qt5_quicktemplates2.mk new file mode 100644 index 0000000000..e1986a540d --- /dev/null +++ b/repos/libports/lib/import/import-qt5_quicktemplates2.mk @@ -0,0 +1,15 @@ +IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) + +include $(IMPORT_QT5_INC) + +ifeq ($(CONTRIB_DIR),) +QT5_QUICKTEMPLATES2_INC_DIR := $(realpath $(call select_from_repositories,include/QtQuickTemplates2)/..) +else +QT5_QUICKTEMPLATES2_INC_DIR := $(QT5_PORT_DIR)/include +endif + +QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR) +QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2 +QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2/$(QT_VERSION) +QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2/$(QT_VERSION)/QtQuickTemplates2 +QT5_INC_DIR += $(QT5_QUICKTEMPLATES2_INC_DIR)/QtQuickTemplates2/$(QT_VERSION)/QtQuickTemplates2/private diff --git a/repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk b/repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk new file mode 100644 index 0000000000..8d75612078 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquickcontrols2plugin.mk @@ -0,0 +1,45 @@ +IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) + +include $(IMPORT_QT5_INC) + +SHARED_LIB = yes + +include $(REP_DIR)/lib/mk/qt5_qtquickcontrols2plugin_generated.inc + +QT_DEFINES += -UQT_STATICPLUGIN + +include $(REP_DIR)/lib/mk/qt5.inc + +LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_quickcontrols2 qt5_quicktemplates2 + +# install the QML plugin + +QML_PLUGIN_NAME := qt5_qtquickcontrols2plugin +QML_INSTALL_DIR := qt/qml/QtQuick/Controls.2 + +QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so +TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar + +$(QML_INSTALL_DIR): + $(VERBOSE)mkdir -p $@ + +$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped + $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ + +$(TAR_ARCHIVE): $(QML_PLUGIN) + $(VERBOSE)tar cf $@ qt + +ifneq ($(call select_from_ports,qt5),) +$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) +endif + +# +# unfortunately, these clean rules don't trigger +# + +clean-tar_archive: + rm -rf $(TAR_ARCHIVE) + +clean: clean-tar_archive + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc new file mode 100644 index 0000000000..45a403af91 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquickcontrols2plugin_generated.inc @@ -0,0 +1,63 @@ +QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICKTEMPLATES2_LIB -DQT_QUICKCONTROLS2_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB + +QT_INCPATH += \ + qtquickcontrols2/src/imports/controls \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtdeclarative/include/QtQuick/5.13.0 \ + qtdeclarative/include/QtQuick/5.13.0/QtQuick \ + qtbase/include/QtGui/5.13.0 \ + qtbase/include/QtGui/5.13.0/QtGui \ + qtdeclarative/include/QtQml/5.13.0 \ + qtdeclarative/include/QtQml/5.13.0/QtQml \ + qtbase/include/QtCore/5.13.0 \ + qtbase/include/QtCore/5.13.0/QtCore \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ + qtquickcontrols2/include \ + qtquickcontrols2/include/QtQuickTemplates2 \ + qtquickcontrols2/include/QtQuickControls2/5.13.0 \ + qtquickcontrols2/include/QtQuickControls2/5.13.0/QtQuickControls2 \ + qtquickcontrols2/include/QtQuickControls2 \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qquickdefaultbusyindicator.cpp \ + qquickdefaultdial.cpp \ + qquickdefaultprogressbar.cpp \ + qquickdefaultstyle.cpp \ + qquickdefaulttheme.cpp \ + qtquickcontrols2plugin.cpp \ + qrc_qtquickcontrols2plugin.cpp \ + qrc_qmake_QtQuick_Controls_2.cpp \ + moc_qquickdefaultbusyindicator_p.cpp \ + moc_qquickdefaultdial_p.cpp \ + moc_qquickdefaultprogressbar_p.cpp \ + moc_qquickdefaultstyle_p.cpp + +QT_VPATH += \ + qtquickcontrols2/src/imports/controls \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + moc_qquickdefaultbusyindicator_p.cpp \ + moc_qquickdefaultdial_p.cpp \ + moc_qquickdefaultprogressbar_p.cpp \ + moc_qquickdefaultstyle_p.cpp + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + qtquickcontrols2plugin.moc + diff --git a/repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk b/repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk new file mode 100644 index 0000000000..7bfeb01dc3 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquicktemplates2plugin.mk @@ -0,0 +1,45 @@ +IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) + +include $(IMPORT_QT5_INC) + +SHARED_LIB = yes + +include $(REP_DIR)/lib/mk/qt5_qtquicktemplates2plugin_generated.inc + +QT_DEFINES += -UQT_STATICPLUGIN + +include $(REP_DIR)/lib/mk/qt5.inc + +LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_quicktemplates2 + +# install the QML plugin + +QML_PLUGIN_NAME := qt5_qtquicktemplates2plugin +QML_INSTALL_DIR := qt/qml/QtQuick/Templates.2 + +QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so +TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar + +$(QML_INSTALL_DIR): + $(VERBOSE)mkdir -p $@ + +$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped + $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ + +$(TAR_ARCHIVE): $(QML_PLUGIN) + $(VERBOSE)tar cf $@ qt + +ifneq ($(call select_from_ports,qt5),) +$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) +endif + +# +# unfortunately, these clean rules don't trigger +# + +clean-tar_archive: + rm -rf $(TAR_ARCHIVE) + +clean: clean-tar_archive + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc b/repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc new file mode 100644 index 0000000000..2e566a8f24 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquicktemplates2plugin_generated.inc @@ -0,0 +1,46 @@ +QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICKTEMPLATES2_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB + +QT_INCPATH += \ + qtquickcontrols2/src/imports/templates \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtdeclarative/include/QtQuick/5.13.0 \ + qtdeclarative/include/QtQuick/5.13.0/QtQuick \ + qtbase/include/QtGui/5.13.0 \ + qtbase/include/QtGui/5.13.0/QtGui \ + qtdeclarative/include/QtQml/5.13.0 \ + qtdeclarative/include/QtQml/5.13.0/QtQml \ + qtbase/include/QtCore/5.13.0 \ + qtbase/include/QtCore/5.13.0/QtCore \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ + qtquickcontrols2/include \ + qtquickcontrols2/include/QtQuickTemplates2 \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qtquicktemplates2plugin.cpp + +QT_VPATH += \ + qtquickcontrols2/src/imports/templates \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + qtquicktemplates2plugin.moc + diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk new file mode 100644 index 0000000000..7f1fba1017 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin.mk @@ -0,0 +1,45 @@ +IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) + +include $(IMPORT_QT5_INC) + +SHARED_LIB = yes + +include $(REP_DIR)/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc + +QT_DEFINES += -UQT_STATICPLUGIN + +include $(REP_DIR)/lib/mk/qt5.inc + +LIBS += qt5_core qt5_gui qt5_qml qt5_virtualkeyboard + +# install the QML plugin + +QML_PLUGIN_NAME := qt5_qtquickvirtualkeyboardplugin +QML_INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard + +QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so +TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar + +$(QML_INSTALL_DIR): + $(VERBOSE)mkdir -p $@ + +$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped + $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ + +$(TAR_ARCHIVE): $(QML_PLUGIN) + $(VERBOSE)tar cf $@ qt + +ifneq ($(call select_from_ports,qt5),) +$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) +endif + +# +# unfortunately, these clean rules don't trigger +# + +clean-tar_archive: + rm -rf $(TAR_ARCHIVE) + +clean: clean-tar_archive + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc new file mode 100644 index 0000000000..546a43ac95 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc @@ -0,0 +1,43 @@ +QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB + +QT_INCPATH += \ + qtvirtualkeyboard/src/import \ + qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ + qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ + qtvirtualkeyboard/include \ + qtvirtualkeyboard/include/QtVirtualKeyboard \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include/QtGui/5.13.0 \ + qtbase/include/QtGui/5.13.0/QtGui \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore/5.13.0 \ + qtbase/include/QtCore/5.13.0/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qtquickvirtualkeyboardplugin.cpp \ + moc_qtquickvirtualkeyboardplugin.cpp + +QT_VPATH += \ + qtvirtualkeyboard/src/import \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + moc_qtquickvirtualkeyboardplugin.cpp + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + + diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk new file mode 100644 index 0000000000..f513c8b633 --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk @@ -0,0 +1,45 @@ +IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) + +include $(IMPORT_QT5_INC) + +SHARED_LIB = yes + +include $(REP_DIR)/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc + +QT_DEFINES += -UQT_STATICPLUGIN + +include $(REP_DIR)/lib/mk/qt5.inc + +LIBS += qt5_qml qt5_virtualkeyboard + +# install the QML plugin + +QML_PLUGIN_NAME := qt5_qtquickvirtualkeyboardsettingsplugin +QML_INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard/Settings + +QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so +TAR_ARCHIVE := $(BUILD_BASE_DIR)/bin/$(QML_PLUGIN_NAME).tar + +$(QML_INSTALL_DIR): + $(VERBOSE)mkdir -p $@ + +$(QML_PLUGIN): $(QML_INSTALL_DIR) $(QML_PLUGIN_NAME).lib.so.stripped + $(VERBOSE)cp $(QML_PLUGIN_NAME).lib.so.stripped $@ + +$(TAR_ARCHIVE): $(QML_PLUGIN) + $(VERBOSE)tar cf $@ qt + +ifneq ($(call select_from_ports,qt5),) +$(QML_PLUGIN_NAME).lib.tag: $(TAR_ARCHIVE) +endif + +# +# unfortunately, these clean rules don't trigger +# + +clean-tar_archive: + rm -rf $(TAR_ARCHIVE) + +clean: clean-tar_archive + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc new file mode 100644 index 0000000000..c5f28d60ef --- /dev/null +++ b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc @@ -0,0 +1,43 @@ +QT_DEFINES += -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_PLUGIN -DQT_VIRTUALKEYBOARD_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB + +QT_INCPATH += \ + qtvirtualkeyboard/src/settings \ + qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0 \ + qtvirtualkeyboard/include/QtVirtualKeyboard/5.13.0/QtVirtualKeyboard \ + qtvirtualkeyboard/include \ + qtvirtualkeyboard/include/QtVirtualKeyboard \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include/QtGui/5.13.0 \ + qtbase/include/QtGui/5.13.0/QtGui \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore/5.13.0 \ + qtbase/include/QtCore/5.13.0/QtCore \ + qtbase/include/QtCore \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qtquickvirtualkeyboardsettingsplugin.cpp \ + moc_qtquickvirtualkeyboardsettingsplugin.cpp + +QT_VPATH += \ + qtvirtualkeyboard/src/settings \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + moc_qtquickvirtualkeyboardsettingsplugin.cpp + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + + diff --git a/repos/libports/lib/mk/qt5_qtvirtualkeyboardstylesplugin.mk b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk similarity index 87% rename from repos/libports/lib/mk/qt5_qtvirtualkeyboardstylesplugin.mk rename to repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk index dbaff2f211..f8456561e8 100644 --- a/repos/libports/lib/mk/qt5_qtvirtualkeyboardstylesplugin.mk +++ b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk @@ -4,7 +4,7 @@ include $(IMPORT_QT5_INC) SHARED_LIB = yes -include $(REP_DIR)/lib/mk/qt5_qtvirtualkeyboardstylesplugin_generated.inc +include $(REP_DIR)/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc QT_DEFINES += -UQT_STATICPLUGIN @@ -14,7 +14,7 @@ LIBS += qt5_gui qt5_qml qt5_quick qt5_svg qt5_virtualkeyboard # install the QML plugin -QML_PLUGIN_NAME := qt5_qtvirtualkeyboardstylesplugin +QML_PLUGIN_NAME := qt5_qtquickvirtualkeyboardstylesplugin QML_INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard/Styles QML_PLUGIN := $(QML_INSTALL_DIR)/$(QML_PLUGIN_NAME).lib.so diff --git a/repos/libports/lib/mk/qt5_qtvirtualkeyboardstylesplugin_generated.inc b/repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc similarity index 100% rename from repos/libports/lib/mk/qt5_qtvirtualkeyboardstylesplugin_generated.inc rename to repos/libports/lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc diff --git a/repos/libports/lib/mk/qt5_quickcontrols2.mk b/repos/libports/lib/mk/qt5_quickcontrols2.mk new file mode 100644 index 0000000000..ccf7b2ce69 --- /dev/null +++ b/repos/libports/lib/mk/qt5_quickcontrols2.mk @@ -0,0 +1,11 @@ +include $(call select_from_repositories,lib/import/import-qt5_quickcontrols2.mk) + +SHARED_LIB = yes + +LIBS += qt5_core qt5_gui qt5_qml qt5_quick qt5_quicktemplates2 + +include $(REP_DIR)/lib/mk/qt5_quickcontrols2_generated.inc + +include $(REP_DIR)/lib/mk/qt5.inc + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_quickcontrols2_generated.inc b/repos/libports/lib/mk/qt5_quickcontrols2_generated.inc new file mode 100644 index 0000000000..299127cec2 --- /dev/null +++ b/repos/libports/lib/mk/qt5_quickcontrols2_generated.inc @@ -0,0 +1,91 @@ +QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QUICKCONTROLS2_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICKTEMPLATES2_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB + +QT_INCPATH += \ + qtquickcontrols2/src/quickcontrols2 \ + qtquickcontrols2/include \ + qtquickcontrols2/include/QtQuickControls2 \ + qtquickcontrols2/include/QtQuickControls2/5.13.0 \ + qtquickcontrols2/include/QtQuickControls2/5.13.0/QtQuickControls2 \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtdeclarative/include/QtQuick/5.13.0 \ + qtdeclarative/include/QtQuick/5.13.0/QtQuick \ + qtbase/include/QtGui/5.13.0 \ + qtbase/include/QtGui/5.13.0/QtGui \ + qtdeclarative/include/QtQml/5.13.0 \ + qtdeclarative/include/QtQml/5.13.0/QtQml \ + qtbase/include/QtCore/5.13.0 \ + qtbase/include/QtCore/5.13.0/QtCore \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ + qtquickcontrols2/include/QtQuickTemplates2 \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qquickanimatednode.cpp \ + qquickattachedobject.cpp \ + qquickchecklabel.cpp \ + qquickclippedtext.cpp \ + qquickcolor.cpp \ + qquickcolorimage.cpp \ + qquickiconimage.cpp \ + qquickiconlabel.cpp \ + qquickitemgroup.cpp \ + qquickmnemoniclabel.cpp \ + qquickpaddedrectangle.cpp \ + qquickplaceholdertext.cpp \ + qquickstyle.cpp \ + qquickstyleplugin.cpp \ + qquickstyleselector.cpp \ + qquicktumblerview.cpp \ + moc_qquickanimatednode_p.cpp \ + moc_qquickattachedobject_p.cpp \ + moc_qquickchecklabel_p.cpp \ + moc_qquickclippedtext_p.cpp \ + moc_qquickcolor_p.cpp \ + moc_qquickcolorimage_p.cpp \ + moc_qquickiconimage_p.cpp \ + moc_qquickiconlabel_p.cpp \ + moc_qquickitemgroup_p.cpp \ + moc_qquickmnemoniclabel_p.cpp \ + moc_qquickpaddedrectangle_p.cpp \ + moc_qquickplaceholdertext_p.cpp \ + moc_qquickstyleplugin_p.cpp \ + moc_qquicktumblerview_p.cpp + +QT_VPATH += \ + qtquickcontrols2/src/quickcontrols2 \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + moc_qquickanimatednode_p.cpp \ + moc_qquickattachedobject_p.cpp \ + moc_qquickchecklabel_p.cpp \ + moc_qquickclippedtext_p.cpp \ + moc_qquickcolor_p.cpp \ + moc_qquickcolorimage_p.cpp \ + moc_qquickiconimage_p.cpp \ + moc_qquickiconlabel_p.cpp \ + moc_qquickitemgroup_p.cpp \ + moc_qquickmnemoniclabel_p.cpp \ + moc_qquickpaddedrectangle_p.cpp \ + moc_qquickplaceholdertext_p.cpp \ + moc_qquickstyleplugin_p.cpp \ + moc_qquicktumblerview_p.cpp + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + + diff --git a/repos/libports/lib/mk/qt5_quicktemplates2.mk b/repos/libports/lib/mk/qt5_quicktemplates2.mk new file mode 100644 index 0000000000..90c0dacdde --- /dev/null +++ b/repos/libports/lib/mk/qt5_quicktemplates2.mk @@ -0,0 +1,11 @@ +include $(call select_from_repositories,lib/import/import-qt5_quicktemplates2.mk) + +SHARED_LIB = yes + +LIBS += qt5_core qt5_gui qt5_qml qt5_quick + +include $(REP_DIR)/lib/mk/qt5_quicktemplates2_generated.inc + +include $(REP_DIR)/lib/mk/qt5.inc + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_quicktemplates2_generated.inc b/repos/libports/lib/mk/qt5_quicktemplates2_generated.inc new file mode 100644 index 0000000000..5fbcb0c36b --- /dev/null +++ b/repos/libports/lib/mk/qt5_quicktemplates2_generated.inc @@ -0,0 +1,226 @@ +QT_DEFINES += -DQT_NO_FOREACH -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_BUILD_QUICKTEMPLATES2_LIB -DQT_BUILDING_QT -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB + +QT_INCPATH += \ + qtquickcontrols2/src/quicktemplates2 \ + qtquickcontrols2/src/quicktemplates2 \ + qtquickcontrols2/include \ + qtquickcontrols2/include/QtQuickTemplates2 \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0 \ + qtquickcontrols2/include/QtQuickTemplates2/5.13.0/QtQuickTemplates2 \ + qtdeclarative/include \ + qtdeclarative/include/QtQuick \ + qtbase/include \ + qtbase/include/QtGui \ + qtdeclarative/include/QtQml \ + qtbase/include/QtNetwork \ + qtbase/include/QtCore \ + qtdeclarative/include/QtQuick/5.13.0 \ + qtdeclarative/include/QtQuick/5.13.0/QtQuick \ + qtbase/include/QtGui/5.13.0 \ + qtbase/include/QtGui/5.13.0/QtGui \ + qtdeclarative/include/QtQml/5.13.0 \ + qtdeclarative/include/QtQml/5.13.0/QtQml \ + qtbase/include/QtCore/5.13.0 \ + qtbase/include/QtCore/5.13.0/QtCore \ + qtbase/mkspecs/genode-g++ + +QT_SOURCES += \ + qquickabstractbutton.cpp \ + qquickaction.cpp \ + qquickactiongroup.cpp \ + qquickapplicationwindow.cpp \ + qquickbusyindicator.cpp \ + qquickbutton.cpp \ + qquickbuttongroup.cpp \ + qquickcheckbox.cpp \ + qquickcheckdelegate.cpp \ + qquickcombobox.cpp \ + qquickcontainer.cpp \ + qquickcontentitem.cpp \ + qquickcontrol.cpp \ + qquickdeferredexecute.cpp \ + qquickdelaybutton.cpp \ + qquickdial.cpp \ + qquickdialog.cpp \ + qquickdialogbuttonbox.cpp \ + qquickdrawer.cpp \ + qquickframe.cpp \ + qquickgroupbox.cpp \ + qquickicon.cpp \ + qquickitemdelegate.cpp \ + qquicklabel.cpp \ + qquickmenu.cpp \ + qquickmenubar.cpp \ + qquickmenubaritem.cpp \ + qquickmenuitem.cpp \ + qquickmenuseparator.cpp \ + qquickoverlay.cpp \ + qquickpage.cpp \ + qquickpageindicator.cpp \ + qquickpalette.cpp \ + qquickpaletteprovider.cpp \ + qquickpane.cpp \ + qquickpopup.cpp \ + qquickpopupanchors.cpp \ + qquickpopupitem.cpp \ + qquickpopuppositioner.cpp \ + qquickpresshandler.cpp \ + qquickprogressbar.cpp \ + qquickradiobutton.cpp \ + qquickradiodelegate.cpp \ + qquickrangeslider.cpp \ + qquickroundbutton.cpp \ + qquickscrollbar.cpp \ + qquickscrollindicator.cpp \ + qquickscrollview.cpp \ + qquickshortcutcontext.cpp \ + qquickslider.cpp \ + qquickspinbox.cpp \ + qquicksplitview.cpp \ + qquickstackelement.cpp \ + qquickstacktransition.cpp \ + qquickstackview.cpp \ + qquickstackview_p.cpp \ + qquickswipedelegate.cpp \ + qquickswipeview.cpp \ + qquickswitch.cpp \ + qquickswitchdelegate.cpp \ + qquicktabbar.cpp \ + qquicktabbutton.cpp \ + qquicktextarea.cpp \ + qquicktextfield.cpp \ + qquicktheme.cpp \ + qquicktoolbar.cpp \ + qquicktoolbutton.cpp \ + qquicktoolseparator.cpp \ + qquicktooltip.cpp \ + qquickvelocitycalculator.cpp \ + qquicktumbler.cpp \ + moc_qquickabstractbutton_p.cpp \ + moc_qquickbusyindicator_p.cpp \ + moc_qquickbutton_p.cpp \ + moc_qquickcombobox_p.cpp \ + moc_qquickcontentitem_p.cpp \ + moc_qquickcontrol_p.cpp \ + moc_qquickdelaybutton_p.cpp \ + moc_qquickdial_p.cpp \ + moc_qquickdialog_p.cpp \ + moc_qquickdialogbuttonbox_p.cpp \ + moc_qquickdrawer_p.cpp \ + moc_qquickframe_p.cpp \ + moc_qquickgroupbox_p.cpp \ + moc_qquickicon_p.cpp \ + moc_qquickitemdelegate_p.cpp \ + moc_qquicklabel_p.cpp \ + moc_qquickmenubaritem_p.cpp \ + moc_qquickmenuitem_p.cpp \ + moc_qquickmenuseparator_p.cpp \ + moc_qquickoverlay_p.cpp \ + moc_qquickpage_p.cpp \ + moc_qquickpageindicator_p.cpp \ + moc_qquickpalette_p.cpp \ + moc_qquickpopupanchors_p.cpp \ + moc_qquickpopupitem_p_p.cpp \ + moc_qquickprogressbar_p.cpp \ + moc_qquickradiobutton_p.cpp \ + moc_qquickradiodelegate_p.cpp \ + moc_qquickrangeslider_p.cpp \ + moc_qquickroundbutton_p.cpp \ + moc_qquickscrollbar_p.cpp \ + moc_qquickscrollindicator_p.cpp \ + moc_qquickslider_p.cpp \ + moc_qquickspinbox_p.cpp \ + moc_qquickstackview_p.cpp \ + moc_qquickswipe_p.cpp \ + moc_qquickswipedelegate_p.cpp \ + moc_qquickswipeview_p.cpp \ + moc_qquickswitch_p.cpp \ + moc_qquickswitchdelegate_p.cpp \ + moc_qquicktabbar_p.cpp \ + moc_qquicktabbutton_p.cpp \ + moc_qquicktextarea_p.cpp \ + moc_qquicktextfield_p.cpp \ + moc_qquicktoolbar_p.cpp \ + moc_qquicktoolbutton_p.cpp \ + moc_qquicktoolseparator_p.cpp \ + moc_qquicktooltip_p.cpp + +QT_VPATH += \ + qtquickcontrols2/src/quicktemplates2 \ + +# some source files need to be generated by moc from other source/header files before +# they get #included again by the original source file in the compiling stage + +# source files generated from existing header files ('moc_%.cpp: %.h' rule in import-qt5.inc) +# extracted from 'compiler_moc_header_make_all' target + +COMPILER_MOC_HEADER_MAKE_ALL_FILES = \ + moc_qquickabstractbutton_p.cpp \ + moc_qquickaction_p.cpp \ + moc_qquickactiongroup_p.cpp \ + moc_qquickapplicationwindow_p.cpp \ + moc_qquickbusyindicator_p.cpp \ + moc_qquickbutton_p.cpp \ + moc_qquickbuttongroup_p.cpp \ + moc_qquickcheckbox_p.cpp \ + moc_qquickcheckdelegate_p.cpp \ + moc_qquickcombobox_p.cpp \ + moc_qquickcontainer_p.cpp \ + moc_qquickcontentitem_p.cpp \ + moc_qquickcontrol_p.cpp \ + moc_qquickdelaybutton_p.cpp \ + moc_qquickdial_p.cpp \ + moc_qquickdialog_p.cpp \ + moc_qquickdialogbuttonbox_p.cpp \ + moc_qquickdrawer_p.cpp \ + moc_qquickframe_p.cpp \ + moc_qquickgroupbox_p.cpp \ + moc_qquickicon_p.cpp \ + moc_qquickitemdelegate_p.cpp \ + moc_qquicklabel_p.cpp \ + moc_qquickmenu_p.cpp \ + moc_qquickmenubar_p.cpp \ + moc_qquickmenubaritem_p.cpp \ + moc_qquickmenuitem_p.cpp \ + moc_qquickmenuseparator_p.cpp \ + moc_qquickoverlay_p.cpp \ + moc_qquickpage_p.cpp \ + moc_qquickpageindicator_p.cpp \ + moc_qquickpalette_p.cpp \ + moc_qquickpane_p.cpp \ + moc_qquickpopup_p.cpp \ + moc_qquickpopupanchors_p.cpp \ + moc_qquickpopupitem_p_p.cpp \ + moc_qquickprogressbar_p.cpp \ + moc_qquickradiobutton_p.cpp \ + moc_qquickradiodelegate_p.cpp \ + moc_qquickrangeslider_p.cpp \ + moc_qquickroundbutton_p.cpp \ + moc_qquickscrollbar_p.cpp \ + moc_qquickscrollindicator_p.cpp \ + moc_qquickscrollview_p.cpp \ + moc_qquickslider_p.cpp \ + moc_qquickspinbox_p.cpp \ + moc_qquicksplitview_p.cpp \ + moc_qquickstackview_p.cpp \ + moc_qquickswipe_p.cpp \ + moc_qquickswipedelegate_p.cpp \ + moc_qquickswipeview_p.cpp \ + moc_qquickswitch_p.cpp \ + moc_qquickswitchdelegate_p.cpp \ + moc_qquicktabbar_p.cpp \ + moc_qquicktabbutton_p.cpp \ + moc_qquicktextarea_p.cpp \ + moc_qquicktextfield_p.cpp \ + moc_qquicktoolbar_p.cpp \ + moc_qquicktoolbutton_p.cpp \ + moc_qquicktoolseparator_p.cpp \ + moc_qquicktooltip_p.cpp \ + moc_qquicktumbler_p.cpp + +# source files generated from existing source files ('%.moc: %.cpp' rule in import-qt5.inc) +# extracted from 'compiler_moc_source_make_all' rule + +COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \ + + diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index 9fa8bbcafb..06ad13b3fb 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -5242d524294fc3ef0f9dbdd1765a8ca4207e6f43 +62f761cdc81e54230ffa34fbc2b8556c9b4ef70c diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port index b01a049217..fb96fa7d25 100644 --- a/repos/libports/ports/qt5.port +++ b/repos/libports/ports/qt5.port @@ -21,7 +21,7 @@ SHA(${QTSCRIPTCLASSIC}) := 6a4c4ada6f0064f6c5d7663602a37c99250ed6c7398b1775f95de DIR(${QTSCRIPTCLASSIC}) := src/lib/qt5/${QTSCRIPTCLASSIC} URL(symbols) := https://github.com/cproc/genode-symbols.git -REV(symbols) := c3c6e9df42800e972cb37a1d96f618f00f7c7e99 +REV(symbols) := 9d68f3847d7f1570258d46ec38191897eb7f4aea DIR(symbols) := lib/symbols @@ -165,6 +165,20 @@ $(BUILD_DIR)/qtdeclarative/src/qml/Makefile: $(BUILD_DIR)/qtdeclarative/src/Make $(BUILD_DIR)/qtdeclarative/src/quick/Makefile: $(BUILD_DIR)/qtdeclarative/src/Makefile $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/quick.pro) +# qtquickcontrols2 + +$(BUILD_DIR)/qtquickcontrols2/Makefile: $(QMAKE) + $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/qtquickcontrols2.pro) + +$(BUILD_DIR)/qtquickcontrols2/src/Makefile: $(BUILD_DIR)/qtquickcontrols2/Makefile + $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/src/src.pro) + +$(BUILD_DIR)/qtquickcontrols2/src/quickcontrols2/Makefile: $(BUILD_DIR)/qtquickcontrols2/src/Makefile + $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/src/quickcontrols2/quickcontrols2.pro) + +$(BUILD_DIR)/qtquickcontrols2/src/quicktemplates2/Makefile: $(BUILD_DIR)/qtquickcontrols2/src/Makefile + $(call generate_makefile, $(QT5_CONTRIB_DIR)/qtquickcontrols2/src/quicktemplates2/quicktemplates2.pro) + # qtsvg $(BUILD_DIR)/qtsvg/Makefile: $(QMAKE) @@ -346,6 +360,20 @@ include/QtQuick: $(BUILD_DIR)/qtdeclarative/src/quick/Makefile $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/qtquick-config.h $@/ $(VERBOSE)cp $(QT5_CONTRIB_DIR)/qtdeclarative/src/quick/qtquick-config_p.h $@/$(VERSION)/QtQuick/private/ +# qtquickcontrols2 + +include/QtQuickControls2: $(BUILD_DIR)/qtquickcontrols2/src/quickcontrols2/Makefile + $(VERBOSE)$(MSG_GENERATE)$@ + $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) + $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) + $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) + +include/QtQuickTemplates2: $(BUILD_DIR)/qtquickcontrols2/src/quicktemplates2/Makefile + $(VERBOSE)$(MSG_GENERATE)$@ + $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_gen_headers $(OUTPUT_FILTER) + $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_targ_headers $(OUTPUT_FILTER) + $(VERBOSE)make -f $< INSTALL_ROOT=$(CURDIR) install_private_headers $(OUTPUT_FILTER) + # qtscriptclassic include/QtScript: @@ -572,6 +600,8 @@ qt5_headers: include/QtCore \ include/QtScript \ include/QtQml \ include/QtQuick \ + include/QtQuickControls2 \ + include/QtQuickTemplates2 \ include/QtSvg \ include/QtDesigner \ include/QtUiPlugin \ diff --git a/repos/libports/recipes/api/qt5_quickcontrols2/content.mk b/repos/libports/recipes/api/qt5_quickcontrols2/content.mk new file mode 100644 index 0000000000..73e6a45d11 --- /dev/null +++ b/repos/libports/recipes/api/qt5_quickcontrols2/content.mk @@ -0,0 +1,23 @@ +MIRROR_FROM_REP_DIR := lib/import/import-qt5_quickcontrols2.mk \ + lib/import/import-qt5.inc + +content: $(MIRROR_FROM_REP_DIR) + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := include/QtQuickControls2 \ + lib/symbols/qt5_quickcontrols2 + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_quickcontrols2/hash b/repos/libports/recipes/api/qt5_quickcontrols2/hash new file mode 100644 index 0000000000..471c4a209f --- /dev/null +++ b/repos/libports/recipes/api/qt5_quickcontrols2/hash @@ -0,0 +1 @@ +2019-09-05-a 7031fda64cdcc18556c420a96036480d4a58153e diff --git a/repos/libports/recipes/api/qt5_quicktemplates2/content.mk b/repos/libports/recipes/api/qt5_quicktemplates2/content.mk new file mode 100644 index 0000000000..32f3da598c --- /dev/null +++ b/repos/libports/recipes/api/qt5_quicktemplates2/content.mk @@ -0,0 +1,23 @@ +MIRROR_FROM_REP_DIR := lib/import/import-qt5_quicktemplates2.mk \ + lib/import/import-qt5.inc + +content: $(MIRROR_FROM_REP_DIR) + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := include/QtQuickTemplates2 \ + lib/symbols/qt5_quicktemplates2 + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/api/qt5_quicktemplates2/hash b/repos/libports/recipes/api/qt5_quicktemplates2/hash new file mode 100644 index 0000000000..b61308560f --- /dev/null +++ b/repos/libports/recipes/api/qt5_quicktemplates2/hash @@ -0,0 +1 @@ +2019-09-05 ae53732ef4c9b765af09ccf1fa002616d3ea4f3b diff --git a/repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk b/repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk new file mode 100644 index 0000000000..8a53c67418 --- /dev/null +++ b/repos/libports/recipes/raw/qt5_qtquick_controls2/content.mk @@ -0,0 +1,16 @@ +content: qt5_qtquick_controls2.tar + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +INSTALL_DIR := qt/qml/QtQuick/Controls.2 +QMLDIR := $(INSTALL_DIR)/qmldir + +$(INSTALL_DIR): + mkdir -p $@ + +$(QMLDIR): $(INSTALL_DIR) + cp $(PORT_DIR)/src/lib/qt5/qt5/qtquickcontrols2/src/imports/controls/qmldir $@ + +qt5_qtquick_controls2.tar: $(QMLDIR) + tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt + rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_controls2/hash b/repos/libports/recipes/raw/qt5_qtquick_controls2/hash new file mode 100644 index 0000000000..cf026c9279 --- /dev/null +++ b/repos/libports/recipes/raw/qt5_qtquick_controls2/hash @@ -0,0 +1 @@ +2019-09-05 bdba54a331f9dcb8ef7967bf78e936d8f5a3a707 diff --git a/repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk b/repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk new file mode 100644 index 0000000000..f51543896e --- /dev/null +++ b/repos/libports/recipes/raw/qt5_qtquick_templates2/content.mk @@ -0,0 +1,16 @@ +content: qt5_qtquick_templates2.tar + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +INSTALL_DIR := qt/qml/QtQuick/Templates.2 +QMLDIR := $(INSTALL_DIR)/qmldir + +$(INSTALL_DIR): + mkdir -p $@ + +$(QMLDIR): $(INSTALL_DIR) + cp $(PORT_DIR)/src/lib/qt5/qt5/qtquickcontrols2/src/imports/templates/qmldir $@ + +qt5_qtquick_templates2.tar: $(QMLDIR) + tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt + rm -rf qt diff --git a/repos/libports/recipes/raw/qt5_qtquick_templates2/hash b/repos/libports/recipes/raw/qt5_qtquick_templates2/hash new file mode 100644 index 0000000000..716084016e --- /dev/null +++ b/repos/libports/recipes/raw/qt5_qtquick_templates2/hash @@ -0,0 +1 @@ +2019-09-05-a 2fb3f15668a99e40948b485e31381a4489f99774 diff --git a/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk b/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk index 7b5ace6c0d..906269d441 100644 --- a/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk +++ b/repos/libports/recipes/raw/qt5_qtquick_virtualkeyboard/content.mk @@ -2,22 +2,29 @@ content: qt5_qtquick_virtualkeyboard.tar PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard -QMLDIR := $(INSTALL_DIR)/qmldir -STYLES_QMLDIR := $(INSTALL_DIR)/Styles/qmldir +INSTALL_DIR := qt/qml/QtQuick/VirtualKeyboard +QMLDIR := $(INSTALL_DIR)/qmldir +SETTINGS_QMLDIR := $(INSTALL_DIR)/Settings/qmldir +STYLES_QMLDIR := $(INSTALL_DIR)/Styles/qmldir $(INSTALL_DIR): mkdir -p $@ +$(INSTALL_DIR)/Settings: + mkdir -p $@ + $(INSTALL_DIR)/Styles: mkdir -p $@ $(QMLDIR): $(INSTALL_DIR) cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/import/qmldir $@ +$(SETTINGS_QMLDIR): $(INSTALL_DIR)/Settings + cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/settings/qmldir $@ + $(STYLES_QMLDIR): $(INSTALL_DIR)/Styles cp $(PORT_DIR)/src/lib/qt5/qt5/qtvirtualkeyboard/src/styles/qmldir $@ -qt5_qtquick_virtualkeyboard.tar: $(QMLDIR) $(STYLES_QMLDIR) +qt5_qtquick_virtualkeyboard.tar: $(QMLDIR) $(SETTINGS_QMLDIR) $(STYLES_QMLDIR) tar --owner=0 --group=0 --numeric-owner --mode='go=' --mtime='1970-01-01 00:00+00' -cf $@ qt rm -rf qt diff --git a/repos/libports/recipes/src/qt5_qtquick_controls2/content.mk b/repos/libports/recipes/src/qt5_qtquick_controls2/content.mk new file mode 100644 index 0000000000..c1ac6b70c7 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qtquick_controls2/content.mk @@ -0,0 +1,27 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_qtquickcontrols2plugin.mk \ + lib/mk/qt5_qtquickcontrols2plugin_generated.inc \ + lib/mk/qt5.inc \ + +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtquickcontrols2plugin/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_qtquickcontrols2plugin/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_qtquickcontrols2plugin" > $@ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/imports/controls + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_controls2/hash b/repos/libports/recipes/src/qt5_qtquick_controls2/hash new file mode 100644 index 0000000000..7abc137bd1 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qtquick_controls2/hash @@ -0,0 +1 @@ +2019-09-05-d f22755a7bfbfc615697320e32191452148def5ff diff --git a/repos/libports/recipes/src/qt5_qtquick_controls2/used_apis b/repos/libports/recipes/src/qt5_qtquick_controls2/used_apis new file mode 100644 index 0000000000..35be5639a6 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qtquick_controls2/used_apis @@ -0,0 +1,11 @@ +base +libc +mesa +qt5_core +qt5_gui +qt5_network +qt5_qml +qt5_quick +qt5_quickcontrols2 +qt5_quicktemplates2 +stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_templates2/content.mk b/repos/libports/recipes/src/qt5_qtquick_templates2/content.mk new file mode 100644 index 0000000000..c4389d0df0 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qtquick_templates2/content.mk @@ -0,0 +1,27 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_qtquicktemplates2plugin.mk \ + lib/mk/qt5_qtquicktemplates2plugin_generated.inc \ + lib/mk/qt5.inc \ + +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtquicktemplates2plugin/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_qtquicktemplates2plugin/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_qtquicktemplates2plugin" > $@ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/imports/templates + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_qtquick_templates2/hash b/repos/libports/recipes/src/qt5_qtquick_templates2/hash new file mode 100644 index 0000000000..f5c7dc6784 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qtquick_templates2/hash @@ -0,0 +1 @@ +2019-09-05-i 07278befdb8bf2a03a1ef603283f972339daa719 diff --git a/repos/libports/recipes/src/qt5_qtquick_templates2/used_apis b/repos/libports/recipes/src/qt5_qtquick_templates2/used_apis new file mode 100644 index 0000000000..591d08cddb --- /dev/null +++ b/repos/libports/recipes/src/qt5_qtquick_templates2/used_apis @@ -0,0 +1,10 @@ +base +libc +mesa +qt5_core +qt5_gui +qt5_network +qt5_qml +qt5_quick +qt5_quicktemplates2 +stdcxx diff --git a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk b/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk index 72403597ea..961d10d49b 100644 --- a/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk +++ b/repos/libports/recipes/src/qt5_qtquick_virtualkeyboard/content.mk @@ -1,11 +1,17 @@ MIRROR_FROM_REP_DIR := lib/mk/qt5_qtvirtualkeyboardplugin.mk \ lib/mk/qt5_qtvirtualkeyboardplugin_generated.inc \ - lib/mk/qt5_qtvirtualkeyboardstylesplugin.mk \ - lib/mk/qt5_qtvirtualkeyboardstylesplugin_generated.inc \ + lib/mk/qt5_qtquickvirtualkeyboardplugin.mk \ + lib/mk/qt5_qtquickvirtualkeyboardplugin_generated.inc \ + lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin.mk \ + lib/mk/qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc \ + lib/mk/qt5_qtquickvirtualkeyboardstylesplugin.mk \ + lib/mk/qt5_qtquickvirtualkeyboardstylesplugin_generated.inc \ lib/mk/qt5.inc \ content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qtvirtualkeyboardplugin/target.mk \ - src/lib/qt5_qtvirtualkeyboardstylesplugin/target.mk + src/lib/qt5_qtquickvirtualkeyboardplugin/target.mk \ + src/lib/qt5_qtquickvirtualkeyboardsettingsplugin/target.mk \ + src/lib/qt5_qtquickvirtualkeyboardstylesplugin/target.mk $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) @@ -14,13 +20,23 @@ src/lib/qt5_qtvirtualkeyboardplugin/target.mk: mkdir -p $(dir $@) echo "LIBS = qt5_qtvirtualkeyboardplugin" > $@ -src/lib/qt5_qtvirtualkeyboardstylesplugin/target.mk: +src/lib/qt5_qtquickvirtualkeyboardplugin/target.mk: mkdir -p $(dir $@) - echo "LIBS = qt5_qtvirtualkeyboardstylesplugin" > $@ + echo "LIBS = qt5_qtquickvirtualkeyboardplugin" > $@ + +src/lib/qt5_qtquickvirtualkeyboardsettingsplugin/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_qtquickvirtualkeyboardsettingsplugin" > $@ + +src/lib/qt5_qtquickvirtualkeyboardstylesplugin/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_qtquickvirtualkeyboardstylesplugin" > $@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) -MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/plugin \ +MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtvirtualkeyboard/src/import \ + src/lib/qt5/qt5/qtvirtualkeyboard/src/plugin \ + src/lib/qt5/qt5/qtvirtualkeyboard/src/settings \ src/lib/qt5/qt5/qtvirtualkeyboard/src/styles content: $(MIRROR_FROM_PORT_DIR) diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/api b/repos/libports/recipes/src/qt5_quickcontrols2/api new file mode 100644 index 0000000000..7cc64413a5 --- /dev/null +++ b/repos/libports/recipes/src/qt5_quickcontrols2/api @@ -0,0 +1 @@ +qt5_quickcontrols2 diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk new file mode 100644 index 0000000000..a0fb76739f --- /dev/null +++ b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk @@ -0,0 +1,27 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk \ + lib/mk/qt5_quickcontrols2_generated.inc \ + lib/mk/qt5.inc \ + +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quickcontrols2/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_quickcontrols2/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_quickcontrols2" > $@ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/quickcontrols2 + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/hash b/repos/libports/recipes/src/qt5_quickcontrols2/hash new file mode 100644 index 0000000000..6ec1002a0d --- /dev/null +++ b/repos/libports/recipes/src/qt5_quickcontrols2/hash @@ -0,0 +1 @@ +2019-09-05-m 006944c45f37333fc642b2db09e9fbde7a9b2254 diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/used_apis b/repos/libports/recipes/src/qt5_quickcontrols2/used_apis new file mode 100644 index 0000000000..09cf10a1bf --- /dev/null +++ b/repos/libports/recipes/src/qt5_quickcontrols2/used_apis @@ -0,0 +1,11 @@ +base +libc +mesa +qt5_core +qt5_gui +qt5_network +qt5_qml +qt5_quick +qt5_quicktemplates2 +stdcxx +zlib diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/api b/repos/libports/recipes/src/qt5_quicktemplates2/api new file mode 100644 index 0000000000..4af6a2b7a7 --- /dev/null +++ b/repos/libports/recipes/src/qt5_quicktemplates2/api @@ -0,0 +1 @@ +qt5_quicktemplates2 diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/content.mk b/repos/libports/recipes/src/qt5_quicktemplates2/content.mk new file mode 100644 index 0000000000..a57f58bc51 --- /dev/null +++ b/repos/libports/recipes/src/qt5_quicktemplates2/content.mk @@ -0,0 +1,27 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_quicktemplates2.mk \ + lib/mk/qt5_quicktemplates2_generated.inc \ + lib/mk/qt5.inc \ + +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_quicktemplates2/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_quicktemplates2/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_quicktemplates2" > $@ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) + +MIRROR_FROM_PORT_DIR := src/lib/qt5/qt5/qtquickcontrols2/src/quicktemplates2 + +content: $(MIRROR_FROM_PORT_DIR) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $(dir $@) + +content: LICENSE + +LICENSE: + cp $(PORT_DIR)/src/lib/qt5/qt5/LICENSE.LGPLv3 $@ diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/hash b/repos/libports/recipes/src/qt5_quicktemplates2/hash new file mode 100644 index 0000000000..ad727327e2 --- /dev/null +++ b/repos/libports/recipes/src/qt5_quicktemplates2/hash @@ -0,0 +1 @@ +2019-09-05-g 4f7d4ce0d3719ae4c354fe7efff623c538d6127d diff --git a/repos/libports/recipes/src/qt5_quicktemplates2/used_apis b/repos/libports/recipes/src/qt5_quicktemplates2/used_apis new file mode 100644 index 0000000000..6ad27e7924 --- /dev/null +++ b/repos/libports/recipes/src/qt5_quicktemplates2/used_apis @@ -0,0 +1,10 @@ +base +libc +mesa +qt5_core +qt5_network +qt5_gui +qt5_qml +qt5_quick +stdcxx +zlib diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index 00c842f5a0..446e90c8b3 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -1,7 +1,9 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc import_from_depot [depot_user]/raw/qt5_qt_labs_folderlistmodel \ + [depot_user]/raw/qt5_qtquick_controls2 \ [depot_user]/raw/qt5_qtquick_layouts \ + [depot_user]/raw/qt5_qtquick_templates2 \ [depot_user]/raw/qt5_qtquick_virtualkeyboard \ [depot_user]/raw/qt5_qtquick_window \ [depot_user]/raw/qt5_qtquick2 \ @@ -10,8 +12,12 @@ import_from_depot [depot_user]/raw/qt5_qt_labs_folderlistmodel \ [depot_user]/src/qt5_component \ [depot_user]/src/qt5_network \ [depot_user]/src/qt5_qml \ + [depot_user]/src/qt5_quickcontrols2 \ + [depot_user]/src/qt5_quicktemplates2 \ [depot_user]/src/qt5_qt_labs_folderlistmodel \ + [depot_user]/src/qt5_qtquick_controls2 \ [depot_user]/src/qt5_qtquick_layouts \ + [depot_user]/src/qt5_qtquick_templates2 \ [depot_user]/src/qt5_qtquick_virtualkeyboard \ [depot_user]/src/qt5_qtquick_window \ [depot_user]/src/qt5_qtquick2 \ @@ -48,7 +54,7 @@ append config { append config [qt5_start_nodes feature] append config { - + @@ -62,11 +68,17 @@ append config { + + - + + + + + diff --git a/repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch b/repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch new file mode 100644 index 0000000000..01ebe8aead --- /dev/null +++ b/repos/libports/src/lib/qt5/patches/qtquickcontrols2_generated.patch @@ -0,0 +1,67 @@ +qtquickcontrols2_generated.patch + +diff --git a/qtquickcontrols2/src/imports/controls/qmake_QtQuick_Controls_2.qrc b/qtquickcontrols2/src/imports/controls/qmake_QtQuick_Controls_2.qrc +new file mode 100644 +index 0000000..9a0d4e2 +--- /dev/null ++++ b/qtquickcontrols2/src/imports/controls/qmake_QtQuick_Controls_2.qrc +@@ -0,0 +1,59 @@ ++ ++ ++AbstractButton.qml ++Action.qml ++ActionGroup.qml ++ApplicationWindow.qml ++BusyIndicator.qml ++Button.qml ++ButtonGroup.qml ++CheckBox.qml ++CheckDelegate.qml ++ComboBox.qml ++Container.qml ++Control.qml ++DelayButton.qml ++Dial.qml ++Dialog.qml ++DialogButtonBox.qml ++Drawer.qml ++Frame.qml ++GroupBox.qml ++ItemDelegate.qml ++Label.qml ++Menu.qml ++MenuBar.qml ++MenuBarItem.qml ++MenuItem.qml ++MenuSeparator.qml ++Page.qml ++PageIndicator.qml ++Pane.qml ++Popup.qml ++ProgressBar.qml ++RadioButton.qml ++RadioDelegate.qml ++RangeSlider.qml ++RoundButton.qml ++ScrollBar.qml ++ScrollIndicator.qml ++ScrollView.qml ++Slider.qml ++SpinBox.qml ++SplitView.qml ++StackView.qml ++SwipeDelegate.qml ++Switch.qml ++SwitchDelegate.qml ++SwipeView.qml ++TabBar.qml ++TabButton.qml ++TextArea.qml ++TextField.qml ++ToolBar.qml ++ToolButton.qml ++ToolSeparator.qml ++ToolTip.qml ++Tumbler.qml ++ ++ diff --git a/repos/libports/src/lib/qt5/patches/series b/repos/libports/src/lib/qt5/patches/series index 196bb06f5b..b9eafc33c1 100644 --- a/repos/libports/src/lib/qt5/patches/series +++ b/repos/libports/src/lib/qt5/patches/series @@ -8,6 +8,7 @@ qtwebkit_fixes.patch qtwebkit_configuration.patch qtbase_generated.patch qtdeclarative_generated.patch +qtquickcontrols2_generated.patch qtsvg_generated.patch qttools_generated.patch qtvirtualkeyboard_generated.patch diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk new file mode 100644 index 0000000000..dd6a263f2d --- /dev/null +++ b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/import/target.mk @@ -0,0 +1,6 @@ +# the plugin gets loaded via 'dlopen()', therefore it is built separately + +TARGET = dummy-qt5_qtquickvirtualkeyboardplugin +LIBS = qt5_qtquickvirtualkeyboardplugin + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk new file mode 100644 index 0000000000..b8083e9a10 --- /dev/null +++ b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/settings/target.mk @@ -0,0 +1,6 @@ +# the plugin gets loaded via 'dlopen()', therefore it is built separately + +TARGET = dummy-qt5_qtquickvirtualkeyboardsettingsplugin +LIBS = qt5_qtquickvirtualkeyboardsettingsplugin + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk index 06990ea41e..1dad6ea6dc 100644 --- a/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk +++ b/repos/libports/src/lib/qt5/qtvirtualkeyboard/src/imports/qtvirtualkeyboard/styles/target.mk @@ -1,6 +1,6 @@ # the plugin gets loaded via 'dlopen()', therefore it is built separately -TARGET = dummy-qt5_qtvirtualkeyboardstylesplugin -LIBS = qt5_qtvirtualkeyboardstylesplugin +TARGET = dummy-qt5_qtquickvirtualkeyboardstylesplugin +LIBS = qt5_qtquickvirtualkeyboardstylesplugin CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs index c3d5c68fd5..26603b647e 100755 --- a/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs +++ b/repos/libports/src/lib/qt5/tools/lib_mk_file_generator/create_generated_incs @@ -28,12 +28,18 @@ cd qtdeclarative/src/imports/folderlistmodel && ../../../../create_generated_inc cd qtdeclarative/src/imports/layouts && ../../../../create_generated_inc qt5_qquicklayoutsplugin && cp qt5_qquicklayoutsplugin_generated.inc ../../../.. && cd ../../../.. cd qtdeclarative/src/imports/window && ../../../../create_generated_inc qt5_windowplugin && cp qt5_windowplugin_generated.inc ../../../.. && cd ../../../.. +cd qtquickcontrols2/src/quicktemplates2 && ../../../create_generated_inc qt5_quicktemplates2 && cp qt5_quicktemplates2_generated.inc ../../.. && cd ../../.. +cd qtquickcontrols2/src/quickcontrols2 && ../../../create_generated_inc qt5_quickcontrols2 && cp qt5_quickcontrols2_generated.inc ../../.. && cd ../../.. +cd qtquickcontrols2/src/imports/controls && ../../../../create_generated_inc qt5_qtquickcontrols2plugin && cp qt5_qtquickcontrols2plugin_generated.inc ../../../.. && cd ../../../.. +cd qtquickcontrols2/src/imports/templates && ../../../../create_generated_inc qt5_qtquicktemplates2plugin && cp qt5_qtquicktemplates2plugin_generated.inc ../../../.. && cd ../../../.. cd qtsvg/src/svg && ../../../create_generated_inc qt5_svg && cp qt5_svg_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/virtualkeyboard && ../../../create_generated_inc qt5_virtualkeyboard && cp qt5_virtualkeyboard_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/plugin && ../../../create_generated_inc qt5_qtvirtualkeyboardplugin && cp qt5_qtvirtualkeyboardplugin_generated.inc ../../.. && cd ../../.. -cd qtvirtualkeyboard/src/styles && ../../../create_generated_inc qt5_qtvirtualkeyboardstylesplugin && cp qt5_qtvirtualkeyboardstylesplugin_generated.inc ../../.. && cd ../../.. +cd qtvirtualkeyboard/src/virtualkeyboard && ../../../create_generated_inc qt5_virtualkeyboard && cp qt5_virtualkeyboard_generated.inc ../../.. && cd ../../.. +cd qtvirtualkeyboard/src/plugin && ../../../create_generated_inc qt5_qtvirtualkeyboardplugin && cp qt5_qtvirtualkeyboardplugin_generated.inc ../../.. && cd ../../.. +cd qtvirtualkeyboard/src/import && ../../../create_generated_inc qt5_qtquickvirtualkeyboardplugin && cp qt5_qtquickvirtualkeyboardplugin_generated.inc ../../.. && cd ../../.. +cd qtvirtualkeyboard/src/settings && ../../../create_generated_inc qt5_qtquickvirtualkeyboardsettingsplugin && cp qt5_qtquickvirtualkeyboardsettingsplugin_generated.inc ../../.. && cd ../../.. +cd qtvirtualkeyboard/src/styles && ../../../create_generated_inc qt5_qtquickvirtualkeyboardstylesplugin && cp qt5_qtquickvirtualkeyboardstylesplugin_generated.inc ../../.. && cd ../../.. # qtwebkit