diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase')
11 files changed, 48 insertions, 52 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 522afcd1..e606cdbe 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From cabe9683b82493e2547e87ae0057f44f71efe519 Mon Sep 17 00:00:00 2001 +From 46260d1a93e10a6a6f47f38d0b4355b4b63a4682 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -56,10 +56,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 3e97c98..88a308d 100755 +index f4c7813..9ab6a9d 100755 --- a/configure +++ b/configure -@@ -342,6 +342,16 @@ getQMakeConf() +@@ -343,6 +343,16 @@ getQMakeConf() getSingleQMakeVariable "$1" "$specvals" } @@ -76,8 +76,8 @@ index 3e97c98..88a308d 100755 getXQMakeConf() { if [ -z "$xspecvals" ]; then -@@ -351,6 +361,16 @@ getXQMakeConf() - getSingleQMakeVariable "$1" "$xspecvals" +@@ -367,6 +377,16 @@ testXConfig() + esac } +# OE qmake.conf is reading some variables from shell env @@ -93,7 +93,7 @@ index 3e97c98..88a308d 100755 compilerSupportsFlag() { cat >conftest.cpp <<EOF -@@ -557,24 +577,14 @@ fi +@@ -573,24 +593,14 @@ fi # initalize variables #------------------------------------------------------------------------------- @@ -124,7 +124,7 @@ index 3e97c98..88a308d 100755 fi'` eval "$cmd" done -@@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi @@ -133,7 +133,7 @@ index 3e97c98..88a308d 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3504,7 +3514,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi @@ -142,7 +142,7 @@ index 3e97c98..88a308d 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3976,6 +3986,14 @@ setBootstrapVariable() +@@ -4005,6 +4015,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -157,7 +157,7 @@ index 3e97c98..88a308d 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4043,14 +4061,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= @@ -178,9 +178,9 @@ index 3e97c98..88a308d 100755 + setBootstrapEvalVariable QMAKE_LFLAGS + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS - if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then + if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then setBootstrapVariable QMAKE_CFLAGS_RELEASE -@@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4093,6 +4111,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" EXEEXT= @@ -189,10 +189,10 @@ index 3e97c98..88a308d 100755 if [ "$BUILD_ON_MAC" = "yes" ]; then echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 6b37a04..dcf6025 100644 +index a3ec227..eef6006 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf -@@ -63,12 +63,12 @@ defineTest(qtCompileTest) { +@@ -71,12 +71,12 @@ defineTest(qtCompileTest) { } # Clean up after previous run diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 0b0650d3..41d10eaf 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 1edd17d452a7e9eeb2931b3c5697a4fc0ec4e6bc Mon Sep 17 00:00:00 2001 +From 03824427f227ff16c6d23d08c73708b0faf98e06 Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index ca271e6c..f7066371 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,4 +1,4 @@ -From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 Mon Sep 17 00:00:00 2001 +From 7421a689c695a09fff2d5ffbdbe56e34d73f771d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] Add -external-hostbindir option @@ -37,10 +37,10 @@ Conflicts: 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/configure b/configure -index 88a308d..f2611ed 100755 +index 9ab6a9d..225b9f3 100755 --- a/configure +++ b/configure -@@ -810,6 +810,7 @@ QT_HOST_BINS= +@@ -826,6 +826,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= @@ -48,7 +48,7 @@ index 88a308d..f2611ed 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do +@@ -945,6 +946,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \ @@ -56,7 +56,7 @@ index 88a308d..f2611ed 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do +@@ -1175,6 +1177,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; @@ -66,7 +66,7 @@ index 88a308d..f2611ed 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2428,6 +2433,10 @@ Installation options: +@@ -2444,6 +2449,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX) @@ -77,7 +77,7 @@ index 88a308d..f2611ed 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3172,6 +3181,11 @@ fi +@@ -3195,6 +3204,11 @@ fi # command line and environment validation #------------------------------------------------------------------------------- @@ -90,7 +90,7 @@ index 88a308d..f2611ed 100755 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h case "$CFG_QCONFIG" in diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 8639695..d89d948 100644 +index 4a1d265..a2bdd29 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -70,7 +70,11 @@ defineTest(qtHaveModule) { diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index a35b6a2a..233a9c57 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -1,4 +1,4 @@ -From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 Mon Sep 17 00:00:00 2001 +From 156a2e3f61258de4127d582895376a1c674e30a6 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements @@ -68,7 +68,7 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 75b84ff..ab36fa6 100644 +index be08a2a..0310cbb 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) { @@ -92,7 +92,7 @@ index 75b84ff..ab36fa6 100644 contains(QT_CONFIG, static) { QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index cc8ed87..b7d4be2 100644 +index de9ba9d..e59c5e5 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch index e21b36d3..275bd715 100644 --- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From e6ed023b0210375e594b7b61dfb620deb486ee8c Mon Sep 17 00:00:00 2001 +From 4316f6b00153765fd39a0054896910049c607169 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index f2611ed..24a61db 100755 +index 225b9f3..746a088 100755 --- a/configure +++ b/configure -@@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3959,10 +3959,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; /* Installation Info */ diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch index b6758052..be1a6c30 100644 --- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch @@ -1,4 +1,4 @@ -From 05a3901af7a467f9ea5fa9e6f63a574d8d2a9f77 Mon Sep 17 00:00:00 2001 +From af6fed015c4d685e922ed6761262610910ea2219 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <jani.hautakangas@ixonos.com> Date: Thu, 16 May 2013 09:52:07 +0300 Subject: [PATCH] QOpenGLPaintDevice sub-area support diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch index 2fab8884..ad9aef65 100644 --- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch +++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch @@ -1,4 +1,4 @@ -From 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae Mon Sep 17 00:00:00 2001 +From 92eafaf0f5902916ca87b8e3bd63040602ff18bf Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 8 Jun 2015 13:59:25 -0700 Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch index 7ca19133..85ec8e89 100644 --- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch @@ -1,4 +1,4 @@ -From b5c826a39760519010884547d6981c3af031d9c8 Mon Sep 17 00:00:00 2001 +From 92b13af05077dec0d194d4018e36568146d41232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 13 Nov 2015 12:36:11 +0100 Subject: [PATCH] configure paths for target qmake properly @@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 24a61db..2e99d39 100755 +index 746a088..d98ea53 100755 --- a/configure +++ b/configure -@@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then +@@ -3904,8 +3904,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" fi @@ -38,7 +38,7 @@ index 24a61db..2e99d39 100755 QT_CONFIGURE_STR_OFF=0 -@@ -3909,7 +3914,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS +@@ -3938,7 +3943,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS QT_CONFIGURE_STR_OFFSETS= QT_CONFIGURE_STRS= @@ -51,7 +51,7 @@ index 24a61db..2e99d39 100755 addConfStr "$QT_REL_HOST_BINS" addConfStr "$QT_REL_HOST_LIBS" addConfStr "$QT_REL_HOST_DATA" -@@ -3921,6 +3930,12 @@ addConfStr "$shortspec" +@@ -3950,6 +3959,12 @@ addConfStr "$shortspec" #------------------------------------------------------------------------------- [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" @@ -64,7 +64,7 @@ index 24a61db..2e99d39 100755 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF /* License Info */ static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; -@@ -3933,7 +3948,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 +@@ -3962,7 +3977,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; #ifdef QT_BUILD_QMAKE static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; diff --git a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index 7a24459c..1825ac23 100644 --- a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -1,4 +1,4 @@ -From f5a949e17aa8b37491fbc414c38557c9920fa1e5 Mon Sep 17 00:00:00 2001 +From e70b35ba680f2138f0a7ff65852e76248462d459 Mon Sep 17 00:00:00 2001 From: Pascal Bach <pascal.bach@siemens.com> Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS @@ -24,7 +24,6 @@ Upstream-Status: Pending - 0010-Add-external-hostbindir-option-for-native-sdk.patch Signed-off-by: Pascal Bach <pascal.bach@siemens.com> - --- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++ src/corelib/Qt5Config.cmake.in | 5 +++++ @@ -62,6 +61,3 @@ index a872d0e..233d663 100644 if (NOT Qt5_FIND_COMPONENTS) set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\") set(Qt5_FOUND False) --- -2.1.4 - diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch index 230c966d..a5915e93 100644 --- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch @@ -1,4 +1,4 @@ -From 49b2100ff86ab5b4977608903b30cb71075592c6 Mon Sep 17 00:00:00 2001 +From 609d853b42509e8c7da4409e2c97dc44834db564 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 1671338..83de483 100644 +index ed752c3..dbb0b56 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -186,7 +186,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent } } } diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch index 5bb73e75..d257d3f0 100644 --- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch @@ -1,4 +1,4 @@ -From 5b4ae15a19a9135d3dc8a35aa2d109ba8d29868a Mon Sep 17 00:00:00 2001 +From 2aa52f19cab8eafff84d1828367d1e38cb34315d Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] Add -external-hostbindir option for native(sdk) @@ -37,10 +37,10 @@ Conflicts: 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index 2e99d39..a0641d2 100755 +index d98ea53..f42abe6 100755 --- a/configure +++ b/configure -@@ -3922,6 +3922,7 @@ fi +@@ -3951,6 +3951,7 @@ fi addConfStr "$QT_REL_HOST_BINS" addConfStr "$QT_REL_HOST_LIBS" addConfStr "$QT_REL_HOST_DATA" @@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644 HostSpecPath, HostPrefixPath, diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 6f1e2b7..ae03143 100644 +index f2b54f5..d973c11 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp -@@ -1256,6 +1256,13 @@ void Configure::parseCmdLine() +@@ -1261,6 +1261,13 @@ void Configure::parseCmdLine() dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); } @@ -111,7 +111,7 @@ index 6f1e2b7..ae03143 100644 else if (configCmdLine.at(i) == "-make-tool") { ++i; if (i == argCount) -@@ -4232,6 +4239,9 @@ void Configure::generateQConfigCpp() +@@ -4258,6 +4265,9 @@ void Configure::generateQConfigCpp() if (dictionary["QT_REL_HOST_DATA"].isEmpty()) dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; @@ -121,7 +121,7 @@ index 6f1e2b7..ae03143 100644 confStringOff = 0; addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); -@@ -4251,6 +4261,7 @@ void Configure::generateQConfigCpp() +@@ -4277,6 +4287,7 @@ void Configure::generateQConfigCpp() addConfStr(1, dictionary["QT_REL_HOST_BINS"]); addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); addConfStr(1, dictionary["QT_REL_HOST_DATA"]); |