diff options
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4.inc | 62 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch | 47 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch | 56 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/g++.conf | 60 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | 31 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/linux.conf | 66 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 12 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 18 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 11 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 13 |
10 files changed, 376 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc new file mode 100644 index 0000000000..5c06bbe0cb --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc | |||
@@ -0,0 +1,62 @@ | |||
1 | LICENSE = "LGPLv2.1 | GPLv3" | ||
2 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | ||
3 | file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ | ||
4 | file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" | ||
5 | |||
6 | FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" | ||
7 | |||
8 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ | ||
9 | file://0004-no-qmake.patch \ | ||
10 | file://hack-out-pg2-4.7.0.patch \ | ||
11 | file://0006-freetype-host-includes.patch \ | ||
12 | file://0008-qt-lib-infix.patch \ | ||
13 | file://0009-support-2bpp.patch \ | ||
14 | file://0001-Added-Openembedded-crossarch-option.patch \ | ||
15 | file://blacklist-diginotar-certs.diff \ | ||
16 | file://g++.conf \ | ||
17 | file://linux.conf \ | ||
18 | file://fix-qtbug-20925.patch \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" | ||
22 | SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" | ||
23 | |||
24 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | ||
25 | |||
26 | FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" | ||
27 | |||
28 | do_configure_prepend() { | ||
29 | for pro in $(find ${S} -name "*.pro") ; do | ||
30 | sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro | ||
31 | done | ||
32 | |||
33 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf | ||
34 | sed -i \ | ||
35 | -e /QMAKE_MOC\ /d \ | ||
36 | -e /QMAKE_UIC\ /d \ | ||
37 | -e /QMAKE_UIC3\ /d \ | ||
38 | -e /QMAKE_RCC\ /d \ | ||
39 | ${S}/configure | ||
40 | } | ||
41 | |||
42 | do_configure_append() { | ||
43 | sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile | ||
44 | } | ||
45 | |||
46 | QT_GLFLAGS ?= "" | ||
47 | QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" | ||
48 | |||
49 | do_compile() { | ||
50 | # Fixup missing wsegl header in some SGX SDKs | ||
51 | if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then | ||
52 | cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ | ||
53 | fi | ||
54 | |||
55 | unset CFLAGS CXXFLAGS | ||
56 | install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc | ||
57 | install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc | ||
58 | install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic | ||
59 | install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease | ||
60 | |||
61 | oe_runmake ${EXTRA_ENV} | ||
62 | } | ||
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch new file mode 100644 index 0000000000..f302c5bd61 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthias Günther <matgnt@gmail.com> | ||
3 | Date: Wed, 12 May 2010 16:52:45 +0200 | ||
4 | Subject: [PATCH 1/9] Added Openembedded "-crossarch" option | ||
5 | |||
6 | Original Author: Michael Lauer <mickey@vanille-media.de> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | configure | 7 ++++++- | ||
11 | 1 files changed, 6 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/configure b/configure | ||
14 | index facd192..9d15136 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do | ||
18 | shift | ||
19 | VAL=$1 | ||
20 | ;; | ||
21 | - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) | ||
22 | + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) | ||
23 | VAR=`echo $1 | sed "s,^-\(.*\),\1,"` | ||
24 | shift | ||
25 | VAL="$1" | ||
26 | @@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do | ||
27 | xplatform) | ||
28 | XPLATFORM="$VAL" | ||
29 | ;; | ||
30 | + crossarch) | ||
31 | + CROSSARCH="$VAL" | ||
32 | + ;; | ||
33 | debug-and-release) | ||
34 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
35 | CFG_DEBUG_RELEASE="$VAL" | ||
36 | @@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then | ||
37 | CFG_ARCH=$CFG_HOST_ARCH | ||
38 | fi | ||
39 | |||
40 | +CFG_ARCH="$CROSSARCH" | ||
41 | + | ||
42 | if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then | ||
43 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
44 | echo " '$CFG_ARCH' is supported" | ||
45 | -- | ||
46 | 1.7.0.4 | ||
47 | |||
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch new file mode 100644 index 0000000000..f99b76455d --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 852abfca6f4c349dce9b895956922f96d82df579 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrew den Exter <andrew.den-exter@nokia.com> | ||
3 | Date: Thu, 8 Sep 2011 12:28:49 +1000 | ||
4 | Subject: [PATCH] Fix double click and drag not extending word selection. | ||
5 | |||
6 | mousePressed isn't set on the second press of a double click and so | ||
7 | can't be used to determine if all selections should be skipped. Instead | ||
8 | skip only the single click and drag selections if mousePressed is false. | ||
9 | |||
10 | Change-Id: I5e7ba033f38b0f9b98fdca5c61a8548f92991601 | ||
11 | Task-number: QTBUG-20925 | ||
12 | Reviewed-by: Martin Jones | ||
13 | |||
14 | https://bugreports.qt.nokia.com/browse/QTBUG-20925 | ||
15 | |||
16 | Original Author:Andrew den Exter <andrew.den-exter@nokia.com> | ||
17 | Upstream-Status: Integrated in upcoming versions (4.8) as commit 852abfca6f4c349dce9b895956922f96d82df579 | ||
18 | --- | ||
19 | src/gui/text/qtextcontrol.cpp | 7 +---- | ||
20 | tests/auto/qtextedit/tst_qtextedit.cpp | 41 ++++++++++++++++++++++++++++++++ | ||
21 | 2 files changed, 43 insertions(+), 5 deletions(-) | ||
22 | |||
23 | diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp | ||
24 | index aacac04..996d488 100644 | ||
25 | --- a/src/gui/text/qtextcontrol.cpp | ||
26 | +++ b/src/gui/text/qtextcontrol.cpp | ||
27 | @@ -1628,16 +1628,13 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons | ||
28 | return; | ||
29 | } | ||
30 | |||
31 | - if (!mousePressed) | ||
32 | - return; | ||
33 | - | ||
34 | const qreal mouseX = qreal(mousePos.x()); | ||
35 | |||
36 | int newCursorPos = q->hitTest(mousePos, Qt::FuzzyHit); | ||
37 | if (newCursorPos == -1) | ||
38 | return; | ||
39 | |||
40 | - if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) { | ||
41 | + if (mousePressed && wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) { | ||
42 | selectedWordOnDoubleClick = cursor; | ||
43 | selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor); | ||
44 | } | ||
45 | @@ -1646,7 +1643,7 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons | ||
46 | extendBlockwiseSelection(newCursorPos); | ||
47 | else if (selectedWordOnDoubleClick.hasSelection()) | ||
48 | extendWordwiseSelection(newCursorPos, mouseX); | ||
49 | - else | ||
50 | + else if (mousePressed) | ||
51 | setCursorPosition(newCursorPos, QTextCursor::KeepAnchor); | ||
52 | |||
53 | if (interactionFlags & Qt::TextEditable) { | ||
54 | -- | ||
55 | 1.6.1 | ||
56 | |||
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/g++.conf b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf new file mode 100644 index 0000000000..80f925cc5e --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf | |||
@@ -0,0 +1,60 @@ | |||
1 | # | ||
2 | # qmake configuration for common gcc | ||
3 | # | ||
4 | |||
5 | QMAKE_CC = $(OE_QMAKE_CC) | ||
6 | QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) | ||
7 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) | ||
8 | QMAKE_CFLAGS_DEPS += -M | ||
9 | QMAKE_CFLAGS_WARN_ON += -Wall -W | ||
10 | QMAKE_CFLAGS_WARN_OFF += -w | ||
11 | QMAKE_CFLAGS_RELEASE += | ||
12 | QMAKE_CFLAGS_DEBUG += -g | ||
13 | QMAKE_CFLAGS_SHLIB += -fPIC | ||
14 | QMAKE_CFLAGS_STATIC_LIB += -fPIC | ||
15 | QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses | ||
16 | QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden | ||
17 | QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | ||
18 | QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} | ||
19 | |||
20 | QMAKE_CXX = $(OE_QMAKE_CXX) | ||
21 | QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) | ||
22 | QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS | ||
23 | QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON | ||
24 | QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF | ||
25 | QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE | ||
26 | QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO | ||
27 | QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG | ||
28 | QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB | ||
29 | QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB | ||
30 | QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC | ||
31 | QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden | ||
32 | QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | ||
33 | QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE | ||
34 | |||
35 | QMAKE_LINK = $(OE_QMAKE_LINK) | ||
36 | QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) | ||
37 | QMAKE_LINK_C = $(OE_QMAKE_LINK) | ||
38 | QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) | ||
39 | QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) | ||
40 | QMAKE_LFLAGS_RELEASE += | ||
41 | QMAKE_LFLAGS_DEBUG += | ||
42 | QMAKE_LFLAGS_APP += | ||
43 | QMAKE_LFLAGS_SHLIB += -shared | ||
44 | QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB | ||
45 | QMAKE_LFLAGS_SONAME += -Wl,-soname, | ||
46 | QMAKE_LFLAGS_THREAD += | ||
47 | QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined | ||
48 | QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, | ||
49 | |||
50 | QMAKE_PCH_OUTPUT_EXT = .gch | ||
51 | |||
52 | # -Bsymbolic-functions (ld) support | ||
53 | QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions | ||
54 | QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, | ||
55 | |||
56 | # some linking helper... | ||
57 | CONFIG += rpath_libdirs | ||
58 | |||
59 | # for the SDK | ||
60 | isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) | ||
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch new file mode 100644 index 0000000000..39c5f4a32c --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Hack to not use the pg_config of the host system which will add /usr/include | ||
2 | |||
3 | pg_config is a native binary so using that when cross compiling | ||
4 | will always fail. The commented out fix would do, but for OE | ||
5 | our -platform and -xplatform is the same so we are actually not | ||
6 | really cross compiling. Just comment out the test, we are passing | ||
7 | the location to the postgres headers and if they are okay we | ||
8 | will pad. | ||
9 | |||
10 | Original Author: Holger Hans Peter Freyther <zecke@selfish.org> | ||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: qt-everywhere-opensource-src-4.7.0/configure | ||
14 | =================================================================== | ||
15 | --- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 | ||
16 | +++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 | ||
17 | @@ -4921,10 +4921,10 @@ | ||
18 | psql) | ||
19 | if [ "$CFG_SQL_psql" != "no" ]; then | ||
20 | # Be careful not to use native pg_config when cross building. | ||
21 | - if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
22 | - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
23 | - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
24 | - fi | ||
25 | +# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
26 | +# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
27 | +# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
28 | +# fi | ||
29 | [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" | ||
30 | [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" | ||
31 | # But, respect PSQL_LIBS if set | ||
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/linux.conf b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf new file mode 100644 index 0000000000..a54135513b --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf | |||
@@ -0,0 +1,66 @@ | |||
1 | # | ||
2 | # qmake configuration for common linux | ||
3 | # | ||
4 | |||
5 | QMAKE_CFLAGS_THREAD += -D_REENTRANT | ||
6 | QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD | ||
7 | |||
8 | QMAKE_INCDIR = | ||
9 | QMAKE_LIBDIR = | ||
10 | QMAKE_INCDIR_X11 = | ||
11 | QMAKE_LIBDIR_X11 = | ||
12 | QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) | ||
13 | QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) | ||
14 | QMAKE_INCDIR_OPENGL = | ||
15 | QMAKE_LIBDIR_OPENGL = | ||
16 | QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL | ||
17 | QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL | ||
18 | QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL | ||
19 | QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL | ||
20 | QMAKE_INCDIR_EGL = | ||
21 | QMAKE_LIBDIR_EGL = | ||
22 | QMAKE_INCDIR_OPENVG = | ||
23 | QMAKE_LIBDIR_OPENVG = | ||
24 | |||
25 | |||
26 | QMAKE_LIBS = | ||
27 | QMAKE_LIBS_DYNLOAD = -ldl | ||
28 | QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) | ||
29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) | ||
30 | QMAKE_LIBS_NIS = -lnsl | ||
31 | QMAKE_LIBS_EGL = -lEGL | ||
32 | QMAKE_LIBS_OPENGL = -lGLU -lGL | ||
33 | QMAKE_LIBS_OPENGL_QT = -lGL | ||
34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM | ||
35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 | ||
36 | QMAKE_LIBS_OPENVG = -lOpenVG | ||
37 | QMAKE_LIBS_THREAD = -lpthread | ||
38 | |||
39 | QMAKE_MOC = $(OE_QMAKE_MOC) | ||
40 | QMAKE_UIC = $(OE_QMAKE_UIC) | ||
41 | QMAKE_UIC3 = $(OE_QMAKE_UIC3) | ||
42 | QMAKE_RCC = $(OE_QMAKE_RCC) | ||
43 | QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) | ||
44 | QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) | ||
45 | |||
46 | QMAKE_AR = $(OE_QMAKE_AR) cqs | ||
47 | QMAKE_OBJCOPY = objcopy | ||
48 | QMAKE_RANLIB = | ||
49 | |||
50 | QMAKE_TAR = tar -cf | ||
51 | QMAKE_GZIP = gzip -9f | ||
52 | |||
53 | QMAKE_COPY = cp -f | ||
54 | QMAKE_COPY_FILE = $(COPY) | ||
55 | QMAKE_COPY_DIR = $(COPY) -r | ||
56 | QMAKE_MOVE = mv -f | ||
57 | QMAKE_DEL_FILE = rm -f | ||
58 | QMAKE_DEL_DIR = rmdir | ||
59 | QMAKE_STRIP = $(OE_QMAKE_STRIP) | ||
60 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
61 | QMAKE_CHK_DIR_EXISTS = test -d | ||
62 | QMAKE_MKDIR = mkdir -p | ||
63 | QMAKE_INSTALL_FILE = install -m 644 -p | ||
64 | QMAKE_INSTALL_PROGRAM = install -m 755 -p | ||
65 | |||
66 | include(unix.conf) | ||
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb new file mode 100644 index 0000000000..9d893f9d63 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require qt-${PV}.inc | ||
2 | require qt4-embedded.inc | ||
3 | |||
4 | PR = "${INC_PR}.2" | ||
5 | |||
6 | QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " | ||
7 | |||
8 | QT_CONFIG_FLAGS += " \ | ||
9 | -exceptions \ | ||
10 | " | ||
11 | |||
12 | DEFAULT_PREFERENCE = "-1" | ||
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb new file mode 100644 index 0000000000..7196c736d2 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | require qt4-native.inc | ||
2 | |||
3 | PR = "${INC_PR}.1" | ||
4 | |||
5 | SRC_URI += "file://blacklist-diginotar-certs.diff \ | ||
6 | file://fix-qtbug-20925.patch" | ||
7 | |||
8 | # Find the g++.conf/linux.conf in the right directory. | ||
9 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" | ||
10 | |||
11 | EXTRA_OECONF += " -no-fast -silent -no-rpath" | ||
12 | |||
13 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" | ||
14 | |||
15 | SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" | ||
16 | SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" | ||
17 | |||
18 | DEFAULT_PREFERENCE = "-1" | ||
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb new file mode 100644 index 0000000000..77e1f36eea --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require qt4-tools-nativesdk.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI += "file://blacklist-diginotar-certs.diff \ | ||
6 | file://fix-qtbug-20925.patch" | ||
7 | |||
8 | SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" | ||
9 | SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" | ||
10 | |||
11 | DEFAULT_PREFERENCE = "-1" | ||
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb new file mode 100644 index 0000000000..2f39ec0a78 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | require qt4-x11-free.inc | ||
2 | require qt-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.2" | ||
5 | |||
6 | QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon " | ||
7 | |||
8 | QT_CONFIG_FLAGS += " \ | ||
9 | -no-embedded \ | ||
10 | -xrandr \ | ||
11 | -x11" | ||
12 | |||
13 | DEFAULT_PREFERENCE = "-1" | ||