瀏覽代碼

qt5 quickcontrols2 patch

Reinhard Russinger 8 年之前
父節點
當前提交
09d5a70053
共有 4 個文件被更改,包括 24 次插入1 次删除
  1. 21 0
      GfA-buildroot_qt57-qt5quickcontrols2_mk.patch
  2. 1 0
      Make-bb-kernel.sh
  3. 1 0
      MakeBuildrootEnv.sh
  4. 1 1
      board/GfA/Display001/BUILD

+ 21 - 0
GfA-buildroot_qt57-qt5quickcontrols2_mk.patch

@@ -0,0 +1,21 @@
+diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+index d629fd7..23bbb2c 100644
+--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
++++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+@@ -31,10 +31,15 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS
+ endef
+ 
+ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
+-	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
++	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
++	cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
+ 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
++#	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs
+ 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/folderlistmodel $(TARGET_DIR)/usr/qml/Qt/labs
+ 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/settings $(TARGET_DIR)/usr/qml/Qt/labs
++	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick
++	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
++	$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
+ endef
+ 
+ $(eval $(generic-package))

+ 1 - 0
Make-bb-kernel.sh

@@ -33,6 +33,7 @@ patch -p1 < ../GfA/GfA-buildroot_linux_headers_for_rs485.patch
 patch -p1 < ../GfA/GfA-buildroot_force_mutt_to_bind_openssl.patch
 patch -p1 < ../GfA/GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.patch
 patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols_mk.patch
+patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols2_mk.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

+ 1 - 0
MakeBuildrootEnv.sh

@@ -16,6 +16,7 @@ patch -p1 < ../GfA/GfA-buildroot_linux_headers_for_rs485.patch
 patch -p1 < ../GfA/GfA-buildroot_force_mutt_to_bind_openssl.patch
 patch -p1 < ../GfA/GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.patch
 patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols_mk.patch
+patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols2_mk.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-369
+371