From 78ac27d49b0e7a4cf66517bd535a7420209128c6 Mon Sep 17 00:00:00 2001 From: tianduanrui Date: Wed, 20 Jun 2018 17:47:39 +0800 Subject: [PATCH] armhf32 --- multi-link | 2 +- src/qqt_header.pri | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multi-link b/multi-link index 2aca1075..c204d8b8 160000 --- a/multi-link +++ b/multi-link @@ -1 +1 @@ -Subproject commit 2aca107598ff368301b5f81589381baae802b588 +Subproject commit c204d8b898f48938e383e10ee03643ccf35c51ef diff --git a/src/qqt_header.pri b/src/qqt_header.pri index 4a8e5bfe..306e2818 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -170,7 +170,7 @@ defineTest(add_defines_QQt){ #Qt Embedded，没有charts模块 #对于这两种情况，默认删除去。如果用户自己编译了Charts，手动添加charts模块。 lessThan(QT_VERSION, 5.7):DEFINES-=__QT_CHARTS__ - contains(QSYS_PRIVATE, Arm32||Mips32||Embedded):DEFINES-=__QT_CHARTS__ + contains(QSYS_PRIVATE, Arm32|Armhf32 || Mips32 || Embedded):DEFINES-=__QT_CHARTS__ #based on QtCharts, need charts module contains(DEFINES, __QT_CHARTS__ ): QT += charts @@ -256,7 +256,7 @@ defineTest(add_defines_QQt){ #if you use QNetworkAccessManagerSupport , open this annotation DEFINES += __WEBACCESSSUPPORT__ lessThan(QT_MAJOR_VERSION, 5): DEFINES -= __WEBACCESSSUPPORT__ - contains(QSYS_PRIVATE, Arm32||Mips32||Embedded):DEFINES -= __WEBACCESSSUPPORT__ + contains(QSYS_PRIVATE, Arm32|Armhf32 || Mips32 || Embedded):DEFINES -= __WEBACCESSSUPPORT__ contains (DEFINES, __WEBACCESSSUPPORT__) { #QSslError not found, you need recompiler Qt4 } @@ -334,7 +334,7 @@ defineTest(add_defines_QQt){ #opengl module DEFINES += __OPENGLWIDGETS__ - contains(QSYS_PRIVATE, Mips32||Arm32||Embedded):DEFINES-=__OPENGLWIDGETS__ + contains(QSYS_PRIVATE, Arm32|Armhf32 || Mips32 || Embedded):DEFINES-=__OPENGLWIDGETS__ contains (DEFINES, __OPENGLWIDGETS__) { QT += opengl }