diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch | 18 |
1 files changed, 9 insertions, 9 deletions
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 bac18412..6d64e6b5 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 @@ | |||
1 | From 0f4ab3e27938002134e8f3f9eb12cf9c50b2ab95 Mon Sep 17 00:00:00 2001 | 1 | From cc926956758bf8170c4e49c66e1066524b43f65f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 | 3 | Date: Fri, 13 Nov 2015 12:36:11 +0100 |
4 | Subject: [PATCH] configure paths for target qmake properly | 4 | Subject: [PATCH] configure paths for target qmake properly |
@@ -19,11 +19,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 19 insertions(+), 4 deletions(-) | 19 | 1 file changed, 19 insertions(+), 4 deletions(-) |
20 | 20 | ||
21 | diff --git a/configure b/configure | 21 | diff --git a/configure b/configure |
22 | index f49a674..d30d0ca 100755 | 22 | index 8b33c5b..1df248f 100755 |
23 | --- a/configure | 23 | --- a/configure |
24 | +++ b/configure | 24 | +++ b/configure |
25 | @@ -3792,8 +3792,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then | 25 | @@ -1545,8 +1545,13 @@ if [ -z "$QT_REL_HOST_DATA" ]; then |
26 | QMAKE_CONFIG="$QMAKE_CONFIG compile_examples" | 26 | fi |
27 | fi | 27 | fi |
28 | 28 | ||
29 | -shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` | 29 | -shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` |
@@ -38,7 +38,7 @@ index f49a674..d30d0ca 100755 | |||
38 | 38 | ||
39 | QT_CONFIGURE_STR_OFF=0 | 39 | QT_CONFIGURE_STR_OFF=0 |
40 | 40 | ||
41 | @@ -3826,7 +3831,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS | 41 | @@ -1579,7 +1584,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS |
42 | 42 | ||
43 | QT_CONFIGURE_STR_OFFSETS= | 43 | QT_CONFIGURE_STR_OFFSETS= |
44 | QT_CONFIGURE_STRS= | 44 | QT_CONFIGURE_STRS= |
@@ -51,7 +51,7 @@ index f49a674..d30d0ca 100755 | |||
51 | addConfStr "$QT_REL_HOST_BINS" | 51 | addConfStr "$QT_REL_HOST_BINS" |
52 | addConfStr "$QT_REL_HOST_LIBS" | 52 | addConfStr "$QT_REL_HOST_LIBS" |
53 | addConfStr "$QT_REL_HOST_DATA" | 53 | addConfStr "$QT_REL_HOST_DATA" |
54 | @@ -3838,6 +3847,12 @@ addConfStr "$shortspec" | 54 | @@ -1591,6 +1600,12 @@ addConfStr "$shortspec" |
55 | #------------------------------------------------------------------------------- | 55 | #------------------------------------------------------------------------------- |
56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" | 56 | [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global" |
57 | 57 | ||
@@ -62,9 +62,9 @@ index f49a674..d30d0ca 100755 | |||
62 | +fi | 62 | +fi |
63 | + | 63 | + |
64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF | 64 | cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF |
65 | /* License Info */ | 65 | /* Installation date */ |
66 | static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee"; | 66 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; |
67 | @@ -3850,7 +3865,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 | 67 | @@ -1599,7 +1614,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2 |
68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; | 68 | static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; |
69 | #ifdef QT_BUILD_QMAKE | 69 | #ifdef QT_BUILD_QMAKE |
70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; | 70 | static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; |