Bump Qt5 to version 5.1.1
cover Bump Qt5 to version 5.1.1
These patches bump qt5 to the latest stable version (5.1.1). They also add the new module packages provided with 5.1 series.
Fatih A??c? (5):
qt5: bump to 5.1.1
qt5quickcontrols: new package
qt5sensors: new package
qt5serialport: new package
qt5x11extras: new package
package/qt5/Config.in | 4 ++ package/qt5/qt5.mk | 4 +- package/qt5/qt5base/Config.in | 2 + ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ----------- package/qt5/qt5base/qt5base-mkspecs-files.patch | 5 +- ...-Add-egl-cflags-when-opengles2-is-enabled.patch | 29 ++++++++++ package/qt5/qt5base/qt5base.mk | 10 +++- package/qt5/qt5declarative/qt5declarative.mk | 1 + .../qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch | 33 ----------- package/qt5/qt5quick1/qt5quick1.mk | 4 +- package/qt5/qt5quickcontrols/Config.in | 20 +++++++ package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 37 +++++++++++++ package/qt5/qt5sensors/Config.in | 10 ++++ package/qt5/qt5sensors/qt5sensors.mk | 58 ++++++++++++++++++++ package/qt5/qt5serialport/Config.in | 10 ++++ package/qt5/qt5serialport/qt5serialport.mk | 42 ++++++++++++++ package/qt5/qt5x11extras/Config.in | 11 ++++ package/qt5/qt5x11extras/qt5x11extras.mk | 42 ++++++++++++++ 18 files changed, 279 insertions(+), 75 deletions(-) delete mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch create mode 100644 package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch create mode 100644 package/qt5/qt5quickcontrols/Config.in create mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.mk create mode 100644 package/qt5/qt5sensors/Config.in create mode 100644 package/qt5/qt5sensors/qt5sensors.mk create mode 100644 package/qt5/qt5serialport/Config.in create mode 100644 package/qt5/qt5serialport/qt5serialport.mk create mode 100644 package/qt5/qt5x11extras/Config.in create mode 100644 package/qt5/qt5x11extras/qt5x11extras.mk
Signature · 1 line
1.7.10.4
PATCH 1/5 qt5: bump to 5.1.1
--- package/qt5/qt5.mk | 4 +-- package/qt5/qt5base/Config.in | 2 ++ ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ------------------- package/qt5/qt5base/qt5base-mkspecs-files.patch | 5 +-- ...-Add-egl-cflags-when-opengles2-is-enabled.patch | 29 +++++++++++++++++ package/qt5/qt5base/qt5base.mk | 10 ++++-- package/qt5/qt5declarative/qt5declarative.mk | 1 + .../qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch | 33 -------------------- package/qt5/qt5quick1/qt5quick1.mk | 4 +-- 9 files changed, 45 insertions(+), 75 deletions(-) delete mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch create mode 100644 package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
package/qt5/qt5.mk +2 -2
@@ -1,5 +1,5 @@ -QT5_VERSION = 5.0.2 -QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/ +QT5_VERSION = 5.1.1 +QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/ include $(sort $(wildcard package/qt5/*/*.mk)) define QT5_LA_PRL_FILES_FIXUP
package/qt5/qt5base/Config.in +2 -0
@@ -104,6 +104,7 @@ if BR2_PACKAGE_QT5BASE_GUI config BR2_PACKAGE_QT5BASE_WIDGETS bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB help This option enables the Qt5Widgets library.
@@ -122,6 +123,7 @@ config BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XCB_UTIL_IMAGE select BR2_PACKAGE_XCB_UTIL_KEYSYMS select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7
package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Sun, 13 Jan 2013 14:36:48 +0100 -Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include - paths - -The eglconvenience code includes <EGL/egl.h>. Therefore, it should get -the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, -otherwise the build might if the EGL library has its headers in -special locations. In order to achieve this, we simply add the "egl" -feature to the list of features imported by eglconvenience. - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - .../eglconvenience/eglconvenience.pri | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri -index 188eb1c..8996cea 100644 ---- a/src/platformsupport/eglconvenience/eglconvenience.pri -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) { - SOURCES += \ - $$PWD/qeglconvenience.cpp \ - $$PWD/qeglplatformcontext.cpp -+ CONFIG += egl - - contains(QT_CONFIG,xlib) { - HEADERS += \ --- -1.7.9.5 -
package/qt5/qt5base/qt5base-mkspecs-files.patch +3 -2
@@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,43 @@ +@@ -0,0 +1,44 @@ +MAKEFILE_GENERATOR = UNIX -+CONFIG += incremental gdb_dwarf_index ++CONFIG += incremental gdb_dwarf_index +QMAKE_INCREMENTAL_STYLE = sublib + +include(../../common/linux.conf)
@@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf +# modifications to linux.conf +QMAKE_AR = $${BUILDROOT_CROSS_COMPILE}ar cqs +QMAKE_OBJCOPY = $${BUILDROOT_CROSS_COMPILE}objcopy ++QMAKE_NM = $${BUILDROOT_CROSS_COMPILE}nm -P +QMAKE_STRIP = $${BUILDROOT_CROSS_COMPILE}strip + +#modifications to gcc-base.conf
package/qt5/qt5base/qt5base-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch new file +29 -0
@@ -0,0 +1,29 @@ +From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <[email protected]> +Date: Sun, 15 Sep 2013 11:15:33 +0300 +Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Fatih A??c? <[email protected]> +--- + src/plugins/platforms/xcb/xcb-plugin.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro +index 8299528..bc21afe 100644 +--- a/src/plugins/platforms/xcb/xcb-plugin.pro ++++ b/src/plugins/platforms/xcb/xcb-plugin.pro +@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) { + contains(QT_CONFIG, opengl) { + contains(QT_CONFIG, opengles2) { + DEFINES += XCB_USE_EGL +- LIBS += -lEGL ++ CONFIG += egl + HEADERS += qxcbeglsurface.h + + # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType +-- +1.7.10.4 +
package/qt5/qt5base/qt5base.mk +7 -3
@@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5BASE_CONFIGURE_OPTS += -xcb +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon QT5BASE_DEPENDENCIES += \ libxcb \ xcb-util-wm \ xcb-util-image \ xcb-util-keysyms \ - xlib_libX11 + xlib_libX11 \ + libxkbcommon +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +QT5BASE_DEPENDENCIES += xlib_libXext +endif else QT5BASE_CONFIGURE_OPTS += -no-xcb endif
@@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS -sysroot $(STAGING_DIR) \ -plugindir /usr/lib/qt/plugins \ -no-rpath \ - -nomake examples -nomake demos -nomake tests \ + -nomake examples -nomake tests \ -device buildroot \ -no-c++11 \ $(QT5BASE_CONFIGURE_OPTS) \
package/qt5/qt5declarative/qt5declarative.mk +1 -0
@@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),) define QT5DECLARATIVE_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins endef endif
package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch deleted +0 -33
@@ -1,33 +0,0 @@ -Fix build on uClibc - -Patch taken from https://code.google.com/p/v8/source/detail?r=12094. - -Review URL: https://chromiumcodereview.appspot.com/10784012 -Patch from Remi Duraffort <[email protected]>. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc -=================================================================== ---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc 2012-12-18 20:04:01.000000000 +0100 -+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc 2013-03-03 20:31:46.000000000 +0100 -@@ -1030,7 +1030,8 @@ - sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]); - #elif V8_HOST_ARCH_ARM - // An undefined macro evaluates to 0, so this applies to Android's Bionic also. --#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ -+ !defined(__UCLIBC__)) - sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]); - sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]); - sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]); -@@ -1038,7 +1039,8 @@ - sample->pc = reinterpret_cast<Address>(mcontext.arm_pc); - sample->sp = reinterpret_cast<Address>(mcontext.arm_sp); - sample->fp = reinterpret_cast<Address>(mcontext.arm_fp); --#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && -+ // !defined(__UCLIBC__)) - #elif V8_HOST_ARCH_MIPS - sample->pc = reinterpret_cast<Address>(mcontext.pc); - sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]);
package/qt5/qt5quick1/qt5quick1.mk +1 -3
@@ -12,7 +12,6 @@ QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsba QT5QUICK1_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0 QT5QUICK1_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else
@@ -35,8 +34,7 @@ endef define QT5QUICK1_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling $(TARGET_DIR)/usr/lib/qt/plugins/ cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr endef
Signature · 1 line
1.7.10.4
PATCH 1/5 qt5: bump to 5.1.1
Dear Fatih A??c?,
Nice!
However, I believe this bump is far from being trivial, and the commit log should therefore give a lot more details about the changes being made. A few questions below to show the kind of details that I believe are missing.
Quoted 28 lines · Fatih A??c?
package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch deleted +0
-22@@ -1,32 +0,0 @@ -From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Sun, 13 Jan 2013 14:36:48 +0100 -Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include - paths - -The eglconvenience code includes <EGL/egl.h>. Therefore, it should get -the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, -otherwise the build might if the EGL library has its headers in -special locations. In order to achieve this, we simply add the "egl" -feature to the list of features imported by eglconvenience. - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - .../eglconvenience/eglconvenience.pri | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri -index 188eb1c..8996cea 100644 ---- a/src/platformsupport/eglconvenience/eglconvenience.pri -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {
package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch line 32
Quoted 10 lines
package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch deleted +0
-10- SOURCES += \ - $$PWD/qeglconvenience.cpp \ - $$PWD/qeglplatformcontext.cpp -+ CONFIG += egl - - contains(QT_CONFIG,xlib) { - HEADERS += \ --- -1.7.9.5 -
Why is this patch removed? Was this fixed in Qt upstream? I see you're adding a CONFIG += egl in another patch, but only for the X.org case.
package/qt5/qt5base/qt5base-mkspecs-files.patch Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf · line 19
Quoted 13 lines
package/qt5/qt5base/qt5base-mkspecs-files.patch +2
-2@@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,43 @@ +@@ -0,0 +1,44 @@ +MAKEFILE_GENERATOR = UNIX -+CONFIG += incremental gdb_dwarf_index ++CONFIG += incremental gdb_dwarf_index
Is this change needed? Seems like white space change only, no?
Quoted 25 lines
package/qt5/qt5base/qt5base.mk +6
-2@@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5BASE_CONFIGURE_OPTS += -xcb +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon QT5BASE_DEPENDENCIES += \ libxcb \ xcb-util-wm \ xcb-util-image \ xcb-util-keysyms \ - xlib_libX11 + xlib_libX11 \ + libxkbcommon +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +QT5BASE_DEPENDENCIES += xlib_libXext +endif else QT5BASE_CONFIGURE_OPTS += -no-xcb endif
package/qt5/qt5base/qt5base.mk define QT5BASE_CONFIGURE_CMDS · line 179
Quoted 5 lines
package/qt5/qt5base/qt5base.mk +1
-1@@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS -sysroot $(STAGING_DIR) \ -plugindir /usr/lib/qt/plugins \ -no-rpath \ - -nomake examples -nomake demos -nomake tests \ + -nomake examples -nomake tests \
No more demos to disable?
package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch
Quoted 20 lines
package/qt5/qt5base/qt5base.mk +0
-0-device buildroot \ -no-c++11 \ $(QT5BASE_CONFIGURE_OPTS) \package/qt5/qt5declarative/qt5declarative.mk +1
-0@@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),) define QT5DECLARATIVE_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins endef endifpackage/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch deleted +0
-0
So this patch was merged upstream? Or is no longer needed?
Quoted 2 lines
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license
Hum why does this gets removed from qt5quick1 but not the other packages? Maybe it's only needed in qt5base, but in this case, it should be removed from all other packages, and as a separate patch, since it's unrelated to the version bump, no?
Thanks a lot!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 2/5 qt5quickcontrols: new package
In reply to Fatih Aşıcı--- package/qt5/Config.in | 1 + package/qt5/qt5quickcontrols/Config.in | 20 ++++++++++++ package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 37 ++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 package/qt5/qt5quickcontrols/Config.in create mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.mk
package/qt5/Config.in +1 -0
@@ -22,6 +22,7 @@ source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5jsbackend/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quick1/Config.in" +source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in"
package/qt5/qt5quickcontrols/Config.in new file +20 -0
@@ -0,0 +1,20 @@ +config BR2_PACKAGE_QT5QUICKCONTROLS + bool "qt5quickcontrols" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_NETWORK + select BR2_PACKAGE_QT5DECLARATIVE + # qt5declarative -> qt5jsbackend + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE + depends on BR2_PACKAGE_HAS_OPENGL_EGL + depends on BR2_PACKAGE_HAS_OPENGL_ES + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5quickcontrols module. + + http://qt-project.org + +comment "qt5quickcontrols requires an OpenGL-capable backend" + depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \ + BR2_PACKAGE_QT5JSBACKEND_AVAILABLE
package/qt5/qt5quickcontrols/qt5quickcontrols.mk new file +37 -0
@@ -0,0 +1,37 @@ +################################################################################ +# +# qt5quickcontrols +# +################################################################################ + +QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) +QT5QUICKCONTROLS_SITE = $(QT5_SITE) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative +QT5QUICKCONTROLS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5QUICKCONTROLS_LICENSE = LGPLv2.1 or GPLv3.0 +QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5QUICKCONTROLS_LICENSE = Commercial license +QT5QUICKCONTROLS_REDISTRIBUTE = NO +endif + +define QT5QUICKCONTROLS_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5QUICKCONTROLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml +endef + +$(eval $(generic-package))
Signature · 1 line
1.7.10.4
PATCH 2/5 qt5quickcontrols: new package
Dear Fatih A??c?,
Quoted 8 lines · Fatih A??c?
Signed-off-by Fatih A??c? <[email protected]>--- package/qt5/Config.in | 1 + package/qt5/qt5quickcontrols/Config.in | 20 ++++++++++++ package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 37 ++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 package/qt5/qt5quickcontrols/Config.in create mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.mk
Not tested, but:
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 3/5 qt5sensors: new package
In reply to Fatih Aşıcı--- package/qt5/Config.in | 1 + package/qt5/qt5sensors/Config.in | 10 ++++++ package/qt5/qt5sensors/qt5sensors.mk | 58 ++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 package/qt5/qt5sensors/Config.in create mode 100644 package/qt5/qt5sensors/qt5sensors.mk
package/qt5/Config.in +1 -0
@@ -24,6 +24,7 @@ source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5script/Config.in" +source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5sensors/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5SENSORS + bool "qt5sensors" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5sensors module. + + http://qt-project.org
package/qt5/qt5sensors/qt5sensors.mk new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 3/5 qt5sensors: new package
Dear Fatih A??c?,
package/qt5/qt5sensors/qt5sensors.mk line 17
Quoted 5 lines · Fatih A??c?
package/qt5/qt5sensors/qt5sensors.mk new file +5
-0+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5SENSORS_LICENSE = LGPLv2.1 or GPLv3.0 +# Here we would like to get license files from qt5base, but qt5base +# may not be extracted at the time we get the legal-info for +# qt5script.
This seems copy/pasted from older packages, while the qt5sensors tarball in fact has license files. This should also be fixed similarly in patches 4 and 5.
Thanks!
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 4/5 qt5serialport: new package
In reply to Fatih Aşıcı--- package/qt5/Config.in | 1 + package/qt5/qt5serialport/Config.in | 10 +++++++ package/qt5/qt5serialport/qt5serialport.mk | 42 ++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 package/qt5/qt5serialport/Config.in create mode 100644 package/qt5/qt5serialport/qt5serialport.mk
package/qt5/Config.in +1 -0
@@ -25,6 +25,7 @@ source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5sensors/Config.in" +source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5serialport/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5SERIALPORT + bool "qt5serialport" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5serialport module. + + http://qt-project.org
package/qt5/qt5serialport/qt5serialport.mk new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 5/5 qt5x11extras: new package
In reply to Fatih Aşıcı--- package/qt5/Config.in | 1 + package/qt5/qt5x11extras/Config.in | 11 ++++++++ package/qt5/qt5x11extras/qt5x11extras.mk | 42 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 package/qt5/qt5x11extras/Config.in create mode 100644 package/qt5/qt5x11extras/qt5x11extras.mk
package/qt5/Config.in +1 -0
@@ -28,5 +28,6 @@ source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" endif
package/qt5/qt5x11extras/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5X11EXTRAS + bool "qt5x11extras" + select BR2_PACKAGE_QT5BASE_WIDGETS + depends on BR2_PACKAGE_QT5BASE_XCB + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5x11extras module. + + http://qt-project.org
package/qt5/qt5x11extras/qt5x11extras.mk new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
1.7.10.4