diff options
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/qt5base/qt5base-0002-mkspecs-files.patch | 3 | ||||
| -rw-r--r-- | package/qt5/qt5quick1/Config.in | 9 | ||||
| -rw-r--r-- | package/qt5/qt5quick1/qt5quick1.mk | 2 | ||||
| -rw-r--r-- | package/qt5/qt5webkit/qt5webkit.mk | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch index 06436b4a42..6283bbe0c5 100644 --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch @@ -14,13 +14,14 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,11 @@ +@@ -0,0 +1,12 @@ +include(../common/linux_device_pre.conf) + +#modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +QMAKE_CXXFLAGS_RELEASE += -O3 ++CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl + diff --git a/package/qt5/qt5quick1/Config.in b/package/qt5/qt5quick1/Config.in index 30c2e79182..32656bed40 100644 --- a/package/qt5/qt5quick1/Config.in +++ b/package/qt5/qt5quick1/Config.in @@ -2,14 +2,12 @@ config BR2_PACKAGE_QT5QUICK1 bool "qt5quick1" select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_NETWORK select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SCRIPT select BR2_PACKAGE_QT5XMLPATTERNS - select BR2_PACKAGE_QT5DECLARATIVE # This module does not support static linking depends on !BR2_PREFER_STATIC_LIB - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -19,7 +17,6 @@ config BR2_PACKAGE_QT5QUICK1 http://qt-project.org -comment "qt5quick1 needs a toolchain w/ dynamic library and an OpenGL-capable backend" +comment "qt5quick1 needs a toolchain w/ dynamic library" depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES || \ - BR2_PREFER_STATIC_LIB + depends on BR2_PREFER_STATIC_LIB diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk index 624b130775..e9d7a64ae6 100644 --- a/package/qt5/qt5quick1/qt5quick1.mk +++ b/package/qt5/qt5quick1/qt5quick1.mk @@ -7,7 +7,7 @@ QT5QUICK1_VERSION = $(QT5_VERSION) QT5QUICK1_SITE = $(QT5_SITE) QT5QUICK1_SOURCE = qtquick1-opensource-src-$(QT5QUICK1_VERSION).tar.xz -QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative \ +QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script \ $(if $(BR2_PACKAGE_QT5WEBKIT),qt5webkit) QT5QUICK1_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 300b9d9904..33b775d06e 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -7,7 +7,7 @@ QT5WEBKIT_VERSION = $(QT5_VERSION) QT5WEBKIT_SITE = $(QT5_SITE) QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison +QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-flex QT5WEBKIT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) |
