From db05fe6ae149762fb86419aa289995ffd1b9a1a0 Mon Sep 17 00:00:00 2001 From: lupeng Date: Fri, 18 Jan 2019 14:43:14 +0800 Subject: [PATCH] [qt] 1.enable qt 2.update qt_env.sh --- package/netease/clockFrame/Makefile | 2 +- package/netease/submodules | 2 +- package/qt/qt5/files/qt-env.sh | 10 ++- target/allwinner/mandolin-c1evb/defconfig | 99 ++++++++++++++++++----- 4 files changed, 88 insertions(+), 25 deletions(-) mode change 100644 => 100755 package/qt/qt5/files/qt-env.sh diff --git a/package/netease/clockFrame/Makefile b/package/netease/clockFrame/Makefile index 07458eb7f..c0bc871fa 100755 --- a/package/netease/clockFrame/Makefile +++ b/package/netease/clockFrame/Makefile @@ -8,7 +8,7 @@ PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=ssh://git@g.hz.netease.com:22222/IoT/PV2/C1-windows.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=de969dec3f95a3c67e65a74b0647812e84f61ea9 +PKG_SOURCE_VERSION:=0a133512b7d7748b6365c1577adb11c1f326e952 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION).tar.gz QMAKE_R311 := $(STAGING_DIR)/host/bin/qmake diff --git a/package/netease/submodules b/package/netease/submodules index a2ebc69e6..8d682c33b 160000 --- a/package/netease/submodules +++ b/package/netease/submodules @@ -1 +1 @@ -Subproject commit a2ebc69e64ca881b3b2c7dbd069766595ed67fe9 +Subproject commit 8d682c33b55577fcbf96f413b3088654fbbb9591 diff --git a/package/qt/qt5/files/qt-env.sh b/package/qt/qt5/files/qt-env.sh old mode 100644 new mode 100755 index 17220f3f8..7a395924b --- a/package/qt/qt5/files/qt-env.sh +++ b/package/qt/qt5/files/qt-env.sh @@ -1,8 +1,12 @@ #!/bin/sh -export QT_QPA_PLATFORM=eglfs:size=800x480 +export QT_QPA_PLATFORM=eglfs:size=854x480 export QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/qt5/plugins export QT_QPA_FONTDIR=/usr/lib/fonts export QT_QPA_GENERIC_PLUGINS=tslib -export QT_QPA_GENERIC_PLUGINS=evdevmouse:/dev/input/event1 -export QT_QPA_GENERIC_PLUGINS=evdevkeyboard:/dev/input/event2 +export QT_QPA_EGLFS_INTEGRATION=none +export XDG_RUNTIME_DIR=/dev/shm +#export QT_QPA_GENERIC_PLUGINS=evdevmouse:/dev/input/event1 +export QT_QPA_GENERIC_PLUGINS=evdevkeyboard:/dev/input/event0 +export QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event3 +export QT_QPA_GENERIC_PLUGINS=evdevtouch:/dev/input/event3 diff --git a/target/allwinner/mandolin-c1evb/defconfig b/target/allwinner/mandolin-c1evb/defconfig index be871f812..a52ff87e4 100755 --- a/target/allwinner/mandolin-c1evb/defconfig +++ b/target/allwinner/mandolin-c1evb/defconfig @@ -168,8 +168,9 @@ CONFIG_PKG_BUILD_USE_JOBSERVER=y # Stripping options # # CONFIG_NO_STRIP is not set -# CONFIG_USE_STRIP is not set -CONFIG_USE_SSTRIP=y +CONFIG_USE_STRIP=y +# CONFIG_USE_SSTRIP is not set +CONFIG_STRIP_ARGS="--strip-all" # CONFIG_STRIP_KERNEL_EXPORTS is not set # CONFIG_USE_MKLIBS is not set # CONFIG_USE_UCLIBCXX is not set @@ -2231,7 +2232,7 @@ CONFIG_PACKAGE_libxtables=y # # GPU Libraries # -# CONFIG_PACKAGE_mali400-um is not set +CONFIG_PACKAGE_mali400-um=y # # IoT @@ -2692,28 +2693,28 @@ CONFIG_PACKAGE_zlib=y # # Translations # -# CONFIG_LUCI_LANG_uk is not set # CONFIG_LUCI_LANG_hu is not set # CONFIG_LUCI_LANG_pt is not set -# CONFIG_LUCI_LANG_ro is not set +# CONFIG_LUCI_LANG_sk is not set +# CONFIG_LUCI_LANG_no is not set # CONFIG_LUCI_LANG_en is not set # CONFIG_LUCI_LANG_pl is not set -# CONFIG_LUCI_LANG_sk is not set -# CONFIG_LUCI_LANG_ja is not set +# CONFIG_LUCI_LANG_uk is not set +# CONFIG_LUCI_LANG_ru is not set # CONFIG_LUCI_LANG_vi is not set # CONFIG_LUCI_LANG_he is not set -# CONFIG_LUCI_LANG_no is not set +# CONFIG_LUCI_LANG_ro is not set # CONFIG_LUCI_LANG_ms is not set # CONFIG_LUCI_LANG_zh-cn is not set # CONFIG_LUCI_LANG_de is not set # CONFIG_LUCI_LANG_zh-tw is not set # CONFIG_LUCI_LANG_tr is not set # CONFIG_LUCI_LANG_sv is not set -# CONFIG_LUCI_LANG_ru is not set -# CONFIG_LUCI_LANG_pt-br is not set +# CONFIG_LUCI_LANG_ja is not set # CONFIG_LUCI_LANG_el is not set # CONFIG_LUCI_LANG_ca is not set # CONFIG_LUCI_LANG_es is not set +# CONFIG_LUCI_LANG_pt-br is not set # CONFIG_LUCI_LANG_cs is not set # CONFIG_LUCI_LANG_fr is not set # CONFIG_LUCI_LANG_it is not set @@ -2893,13 +2894,6 @@ CONFIG_TTF2_SUPPORT=y # CONFIG_PACKAGE_libcae=y CONFIG_PACKAGE_libduilite=y - -# -# DUILITE SDK Select -# -# CONFIG_DUILITE_6MIC is not set -# CONFIG_DUILITE_4MIC is not set -CONFIG_DUILITE_2MIC=y CONFIG_PACKAGE_libmsc=y CONFIG_PACKAGE_libneteasedc=y CONFIG_PACKAGE_libneteasevoicews=y @@ -2947,8 +2941,6 @@ CONFIG_NETEASE_MSC_SDK=y # CONFIG_NETEASE_CAE_SDK is not set # CONFIG_XUNFEI_CAE_SDK is not set CONFIG_NETEASE_DUILITE_SDK=y -# CONFIG_NETEASE_DUILITE_FESPA_SDK is not set -CONFIG_NETEASE_DUILITE_FESPL_SDK=y CONFIG_NETEASE_TTS_SDK=y # CONFIG_XUNFEI_TTS_SDK is not set CONFIG_USED_NONE=y @@ -3302,7 +3294,73 @@ CONFIG_WPA_MSG_MIN_PRIORITY=3 # # Qt # -# CONFIG_PACKAGE_qt5-core is not set +CONFIG_PACKAGE_qt5-core=y +# CONFIG_PACKAGE_qt5-3d is not set +# CONFIG_PACKAGE_qt5-bluetooth is not set +# CONFIG_PACKAGE_qt5-charts is not set +# CONFIG_PACKAGE_qt5-clucene is not set +# CONFIG_PACKAGE_qt5-concurrent is not set +# CONFIG_PACKAGE_qt5-datavis3d is not set +CONFIG_PACKAGE_qt5-dbus=y +# CONFIG_PACKAGE_qt5-drivers-audio is not set +CONFIG_PACKAGE_qt5-drivers-customwidget=y +CONFIG_PACKAGE_qt5-drivers-imageformats=y +CONFIG_PACKAGE_qt5-drivers-keyboard=y +CONFIG_PACKAGE_qt5-drivers-linuxfb=y +CONFIG_PACKAGE_qt5-drivers-mouse=y +CONFIG_PACKAGE_qt5-drivers-touchscreen=y +CONFIG_PACKAGE_qt5-drivers-worldtimeclock=y +# CONFIG_PACKAGE_qt5-enginio is not set +# CONFIG_PACKAGE_qt5-examples is not set +# CONFIG_PACKAGE_qt5-gamepad is not set +CONFIG_PACKAGE_qt5-graphicaleffects=y +# CONFIG_PACKAGE_qt5-gsttools is not set +CONFIG_PACKAGE_qt5-gui=y +# CONFIG_PACKAGE_qt5-help is not set +# CONFIG_PACKAGE_qt5-labstemplates is not set +# CONFIG_PACKAGE_qt5-location is not set +# CONFIG_PACKAGE_qt5-multimedia is not set +CONFIG_PACKAGE_qt5-network=y +# CONFIG_PACKAGE_qt5-nfc is not set +CONFIG_PACKAGE_qt5-opengl=y +# CONFIG_PACKAGE_qt5-positioning is not set +# CONFIG_PACKAGE_qt5-printsupport is not set +CONFIG_PACKAGE_qt5-qml=y +CONFIG_PACKAGE_qt5-quick=y +# CONFIG_PACKAGE_qt5-purchasing is not set +CONFIG_PACKAGE_qt5-quick-2=y +CONFIG_PACKAGE_qt5-quick-controls=y +CONFIG_PACKAGE_qt5-quick-controls-2=y +CONFIG_PACKAGE_qt5-quick-dialogs=y +CONFIG_PACKAGE_qt5-quick-extras=y +CONFIG_PACKAGE_qt5-quick-layouts=y +CONFIG_PACKAGE_qt5-quick-localstorage=y +CONFIG_PACKAGE_qt5-quick-particles=y +CONFIG_PACKAGE_qt5-quick-privatewidgets=y +# CONFIG_PACKAGE_qt5-quick-scene3d is not set +CONFIG_PACKAGE_qt5-quick-window=y +CONFIG_PACKAGE_qt5-quick-xmllistmodel=y +CONFIG_PACKAGE_qt5-quickparticles=y +CONFIG_PACKAGE_qt5-quickwidgets=y +CONFIG_PACKAGE_qt5-remoteobjects=y +# CONFIG_PACKAGE_qt5-script is not set +# CONFIG_PACKAGE_qt5-scripttools is not set +# CONFIG_PACKAGE_qt5-scxml is not set +# CONFIG_PACKAGE_qt5-sensors is not set +# CONFIG_PACKAGE_qt5-serialbus is not set +# CONFIG_PACKAGE_qt5-serialport is not set +# CONFIG_PACKAGE_qt5-speech is not set +CONFIG_PACKAGE_qt5-sql=y +CONFIG_PACKAGE_qt5-svg=y +# CONFIG_PACKAGE_qt5-test is not set +CONFIG_PACKAGE_qt5-virtual-keyboard=y +# CONFIG_PACKAGE_qt5-wayland is not set +# CONFIG_PACKAGE_qt5-webchannel is not set +# CONFIG_PACKAGE_qt5-webengine is not set +# CONFIG_PACKAGE_qt5-websocket is not set +CONFIG_PACKAGE_qt5-widgets=y +CONFIG_PACKAGE_qt5-xml=y +CONFIG_PACKAGE_qt5-xmlpatterns=y # # Security @@ -4566,6 +4624,7 @@ CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y # CONFIG_PACKAGE_mtd-utils-ubiupdatevol is not set # CONFIG_PACKAGE_namei is not set # CONFIG_PACKAGE_ocf-crypto-headers is not set +# CONFIG_PACKAGE_opengles_demo is not set # CONFIG_PACKAGE_openldap-utils is not set # CONFIG_PACKAGE_openmp-test is not set # CONFIG_PACKAGE_openssl-util is not set