qt4.6 : remove 4.6.0
PATCH 4/4 qt4.7 : remove 4.7.0
In reply to Eric Bénardnow that 4.7.1 is here and default for Angstrom, SHR and minimal
--- recipes/qt4/qt-4.7.0.inc | 72 -------------------- .../0001-Added-Openembedded-crossarch-option.patch | 44 ------------ recipes/qt4/qt-4.7.0/g++.conf | 60 ---------------- recipes/qt4/qt-4.7.0/hack-out-pg2-4.7.0.patch | 19 ----- recipes/qt4/qt-4.7.0/linux.conf | 66 ------------------ recipes/qt4/qt4-embedded_4.7.0.bb | 14 ---- recipes/qt4/qt4-tools-native_4.7.0.bb | 22 ------ recipes/qt4/qt4-tools-sdk_4.7.0.bb | 8 -- recipes/qt4/qt4-x11-free-gles_4.7.0.bb | 17 ----- recipes/qt4/qt4-x11-free_4.7.0.bb | 15 ---- 10 files changed, 0 insertions(+), 337 deletions(-) delete mode 100644 recipes/qt4/qt-4.7.0.inc delete mode 100644 recipes/qt4/qt-4.7.0/0001-Added-Openembedded-crossarch-option.patch delete mode 100644 recipes/qt4/qt-4.7.0/g++.conf delete mode 100644 recipes/qt4/qt-4.7.0/hack-out-pg2-4.7.0.patch delete mode 100644 recipes/qt4/qt-4.7.0/linux.conf delete mode 100644 recipes/qt4/qt4-embedded_4.7.0.bb delete mode 100644 recipes/qt4/qt4-tools-native_4.7.0.bb delete mode 100644 recipes/qt4/qt4-tools-sdk_4.7.0.bb delete mode 100644 recipes/qt4/qt4-x11-free-gles_4.7.0.bb delete mode 100644 recipes/qt4/qt4-x11-free_4.7.0.bb
recipes/qt4/qt-4.7.0.inc deleted +0 -72
@@ -1,72 +0,0 @@ -DEFAULT_PREFERENCE = "-1" -LICENSE = "LGPLv2.1 GPLv3" - -FILESPATHPKG =. "qt-${PV}:" - -SRC_URI = "\ - ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0004-no-qmake.patch \ - file://hack-out-pg2-4.7.0.patch \ - file://0006-freetype-host-includes.patch \ - file://0001-Added-Openembedded-crossarch-option.patch \ - file://g++.conf \ - file://linux.conf \ - " -# Set necessary variables in the profile -SRC_URI += "file://qte.sh" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" - -do_configure_prepend() { - for pro in $(find ${S} -name "*.pro") ; do - sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro - done - - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_configure_append() { - sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile -} - -QT_GLFLAGS ?= "" -QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" - -do_compile() { - # Fixup missing wsegl header in some SGX SDKs - if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then - cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ - fi - - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic - install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease - - oe_runmake ${EXTRA_ENV} -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done - - #Append an E to the qtdemo file - if [ -n "${QT_LIBINFIX}" ] ; then - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} - fi -} - -SRC_URI[md5sum] = "3a2f25b9b115037277f4fb759194a7a5" -SRC_URI[sha256sum] = "e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955" -
recipes/qt4/qt-4.7.0/0001-Added-Openembedded-crossarch-option.patch deleted +0 -44
44 lines not on this page · raw message
recipes/qt4/qt-4.7.0/g++.conf deleted +0 -60
60 lines not on this page · raw message
recipes/qt4/qt-4.7.0/hack-out-pg2-4.7.0.patch deleted +0 -19
@@ -1,19 +0,0 @@ -Index: qt-everywhere-opensource-src-4.7.0/configure -=================================================================== ---- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 -+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 -@@ -4921,10 +4921,10 @@ - psql) - if [ "$CFG_SQL_psql" != "no" ]; then - # Be careful not to use native pg_config when cross building. -- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` -- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` -- fi -+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then -+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` -+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` -+# fi - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" - # But, respect PSQL_LIBS if set
recipes/qt4/qt-4.7.0/linux.conf deleted +0 -66
66 lines not on this page · raw message
recipes/qt4/qt4-embedded_4.7.0.bb deleted +0 -14
@@ -1,14 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-embedded.inc - -PR = "${INC_PR}.1" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -exceptions \ -" -
recipes/qt4/qt4-tools-native_4.7.0.bb deleted +0 -22
@@ -1,22 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-tools-native.inc -LICENSE = "LGPLv2.1 GPLv3" - -PR = "${INC_PR}.2" - -# Find the g++.conf/linux.conf in the right directory. -FILESPATHPKG =. "qt-${PV}:" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://qt-config.patch \ - file://g++.conf \ - file://linux.conf" -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -EXTRA_OECONF += " -no-fast -silent -no-rpath" - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "3a2f25b9b115037277f4fb759194a7a5" -SRC_URI[sha256sum] = "e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955" -
recipes/qt4/qt4-tools-sdk_4.7.0.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require qt4-tools-sdk.inc - -PR = "${INC_PR}.2" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI[md5sum] = "3a2f25b9b115037277f4fb759194a7a5" -SRC_URI[sha256sum] = "e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955"
recipes/qt4/qt4-x11-free-gles_4.7.0.bb deleted +0 -17
@@ -1,17 +0,0 @@ -require qt4-x11-free.inc -PR = "${INC_PR}.1" - -QT_GLFLAGS = "-opengl es2 -depths 16,24,32 " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -no-embedded \ - -xrandr \ - -x11" - -FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" - -DEPENDS += "virtual/egl" -require recipes/egl/egl.inc -PROVIDES += "qt4-x11-free"
recipes/qt4/qt4-x11-free_4.7.0.bb deleted +0 -15
@@ -1,15 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-x11-free.inc - -PR = "${INC_PR}.0" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -no-embedded \ - -xrandr \ - -x11" -
Signature · 1 line
1.6.3.3
PATCH 3/4 minimal: prefer QT 4.7.1
In reply to Eric Bénard--- conf/distro/minimal.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/minimal.conf +1 -1
@@ -104,7 +104,7 @@ require conf/distro/include/preferred-xorg-versions-X11R7.5.inc PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" -PREFERRED_QT_VERSION ?= "4.7.0" +PREFERRED_QT_VERSION ?= "4.7.1" PREFERRED_VERSION_qt4-tools-native = "${PREFERRED_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${PREFERRED_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${PREFERRED_QT_VERSION}"
Signature · 1 line
1.6.3.3
PATCH 1/4 qt4.6 : remove 4.6.0
--- recipes/qt4/qt-4.6.0.inc | 80 -- ...ing-of-vectorpaths-to-the-GL-paint-engine.patch | 317 -------- ...17-Better-check-for-EGL-extension-strings.patch | 34 - ...dow-surface-fbo-after-native-GL-rendering.patch | 95 --- ...L-graphicssystem-issues-for-OpenGL-ES-2.0.patch | 146 ---- ...FER_SIZE-to-QEglProperties-reduceConfigur.patch | 33 - ...slucentBackground-for-QGLWidgets-on-X11-E.patch | 180 ----- ...texture-binding-for-QtOpenGL-ETC1-and-PVR.patch | 771 -------------------- ...paint-engine-based-on-fragment-shaders-no.patch | 68 -- ...x-GL_BGRA-formats-under-OpenGL-ES-systems.patch | 40 - ...upport-for-the-inner-border-property-in-G.patch | 92 --- ...-context-is-current-when-loading-compress.patch | 33 - ...3-Fix-upside-down-PVR-compressed-textures.patch | 36 - ...hareRegister-because-qgl_share_reg-is-exp.patch | 26 - ...ing-class-for-stays-on-top-windows-in-DFB.patch | 39 - ...able-customizing-of-DirectFB-layer-to-use.patch | 41 - ...ld-not-use-a-multisampled-format-by-defau.patch | 46 -- ...ets-created-with-an-alpha-channel-on-X11-.patch | 30 - ...face-leaks-when-re-parenting-QGLWidget-on.patch | 116 --- ...th-testing-during-the-2D-QGLWidget-render.patch | 54 -- ...on-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch | 307 -------- ...B-lines-on-a-4-byte-boundary-when-uploadi.patch | 45 -- ...ure-detection-and-initial-blend-function-.patch | 593 --------------- ...leak-of-QGLGlyphCoord-objects-in-the-Open.patch | 60 -- ...-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch | 121 --- ...en-shaders-better-in-the-GL2-engine-s-sha.patch | 269 ------- ...05-Fix-text-rendering-on-GL2-paint-engine.patch | 83 --- .../0006-freetype-host-includes.patch | 20 - .../qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch | 32 - .../0010-no-simpledecoration-example.patch | 11 - recipes/qt4/qt4-embedded-4.6.0/linux.conf | 54 -- recipes/qt4/qt4-embedded-gles_4.6.0.bb | 13 - recipes/qt4/qt4-embedded_4.6.0.bb | 5 - recipes/qt4/qt4-tools-native_4.6.0.bb | 12 - recipes/qt4/qt4-tools-sdk_4.6.0.bb | 77 -- .../qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch | 32 - .../0010-no-simpledecoration-example.patch | 11 - recipes/qt4/qt4-x11-free-4.6.0/linux.conf | 54 -- recipes/qt4/qt4-x11-free-gles_4.6.0.bb | 17 - recipes/qt4/qt4-x11-free_4.6.0.bb | 9 - 40 files changed, 0 insertions(+), 4102 deletions(-) delete mode 100644 recipes/qt4/qt-4.6.0.inc delete mode 100644 recipes/qt4/qt-4.6.0/0860-Added-caching-of-vectorpaths-to-the-GL-paint-engine.patch delete mode 100644 recipes/qt4/qt-4.6.0/0917-Better-check-for-EGL-extension-strings.patch delete mode 100644 recipes/qt4/qt-4.6.0/0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch delete mode 100644 recipes/qt4/qt-4.6.0/0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch delete mode 100644 recipes/qt4/qt-4.6.0/0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch delete mode 100644 recipes/qt4/qt-4.6.0/0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch delete mode 100644 recipes/qt4/qt-4.6.0/0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch delete mode 100644 recipes/qt4/qt-4.6.0/0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch delete mode 100644 recipes/qt4/qt-4.6.0/0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch delete mode 100644 recipes/qt4/qt-4.6.0/0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch delete mode 100644 recipes/qt4/qt-4.6.0/0992-Make-sure-a-context-is-current-when-loading-compress.patch delete mode 100644 recipes/qt4/qt-4.6.0/0993-Fix-upside-down-PVR-compressed-textures.patch delete mode 100644 recipes/qt4/qt-4.6.0/0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch delete mode 100644 recipes/qt4/qt-4.6.0/0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch delete mode 100644 recipes/qt4/qt-4.6.0/0999-Enable-customizing-of-DirectFB-layer-to-use.patch delete mode 100644 recipes/qt4/qt-4.6.0/1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch delete mode 100644 recipes/qt4/qt-4.6.0/1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch delete mode 100644 recipes/qt4/qt-4.6.0/1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch delete mode 100644 recipes/qt4/qt-4.6.0/1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch delete mode 100644 recipes/qt4/qt-4.6.0/1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch delete mode 100644 recipes/qt4/qt-4.6.0/1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch delete mode 100644 recipes/qt4/qt-4.6.0/1165-NEON-configure-detection-and-initial-blend-function-.patch delete mode 100644 recipes/qt4/qt-4.6.0/1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch delete mode 100644 recipes/qt4/qt-4.6.0/1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch delete mode 100644 recipes/qt4/qt-4.6.0/1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch delete mode 100644 recipes/qt4/qt-4.6.0/1205-Fix-text-rendering-on-GL2-paint-engine.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.0/0006-freetype-host-includes.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.0/linux.conf delete mode 100644 recipes/qt4/qt4-embedded-gles_4.6.0.bb delete mode 100644 recipes/qt4/qt4-embedded_4.6.0.bb delete mode 100644 recipes/qt4/qt4-tools-native_4.6.0.bb delete mode 100644 recipes/qt4/qt4-tools-sdk_4.6.0.bb delete mode 100644 recipes/qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch delete mode 100644 recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch delete mode 100644 recipes/qt4/qt4-x11-free-4.6.0/linux.conf delete mode 100644 recipes/qt4/qt4-x11-free-gles_4.6.0.bb delete mode 100644 recipes/qt4/qt4-x11-free_4.6.0.bb
recipes/qt4/qt-4.6.0.inc deleted +0 -80
@@ -1,80 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -FILESPATHPKG .= ":qt-${PV}" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch \ - file://0002-fix-resinit-declaration.patch \ - file://0004-no-qmake.patch \ - file://0006-freetype-host-includes.patch \ - file://0008-qt-lib-infix.patch \ - file://0009-support-2bpp.patch \ - file://0010-no-simpledecoration-example.patch \ - file://fix-config-tests.patch \ - file://g++.conf \ - file://linux.conf \ - " - -# Patches for '4.6' qt branch -SRC_URI += "\ - file://0860-Added-caching-of-vectorpaths-to-the-GL-paint-engine.patch \ - file://0917-Better-check-for-EGL-extension-strings.patch \ - file://0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch \ - file://0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch \ - file://0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch \ - file://0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch \ - file://0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch \ - file://0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch \ - file://0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch \ - file://0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch \ - file://0992-Make-sure-a-context-is-current-when-loading-compress.patch \ - file://0993-Fix-upside-down-PVR-compressed-textures.patch \ - file://0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch \ - file://0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch \ - file://0999-Enable-customizing-of-DirectFB-layer-to-use.patch \ - file://1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch \ - file://1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch \ - file://1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch \ - file://1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch \ - file://1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch \ - file://1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch \ -# file://1165-NEON-configure-detection-and-initial-blend-function-.patch \ - file://1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch \ - file://1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch \ - file://1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch \ - file://1205-Fix-text-rendering-on-GL2-paint-engine.patch \ -" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -do_configure_prepend() { - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -QT_GLFLAGS ?= "" -QT_CONFIG_FLAGS += "${QT_GLFLAGS}" - -do_compile() { - unset CFLAGS CXXFLAGS - oe_runmake ${EXTRA_ENV} -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} - -LICENSE = "LGPLv2.1 GPLv3" -SRC_URI += " \ - file://hack-out-pg_config.patch" - -SRC_URI[md5sum] = "2a7b5126f2450d8525af355fc4c12ad6" -SRC_URI[sha256sum] = "55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589"
recipes/qt4/qt-4.6.0/0860-Added-caching-of-vectorpaths-to-the-GL-paint-engine.patch deleted +0 -317
317 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0917-Better-check-for-EGL-extension-strings.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 108ab335537d20bc74aa9115d46cf91243223c4e Mon Sep 17 00:00:00 2001 -From: Rhys Weatherley <[email protected]> -Date: Fri, 4 Dec 2009 17:03:41 +1000 -Subject: [PATCH 0917/1244] Better check for EGL extension strings - -The previous code might have failed if the desired extension name -was a prefix of another name: "EGL_foo" member of "EGL_foo_bar". -This change introduces a more precise check. - -Task-number: QTBUG-6454 -Reviewed-by: Sarah Smith ---- - src/gui/egl/qegl.cpp | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp -index cf28dc4..6ee4bfc 100644 ---- a/src/gui/egl/qegl.cpp -+++ b/src/gui/egl/qegl.cpp -@@ -429,7 +429,10 @@ QString QEglContext::extensions() - - bool QEglContext::hasExtension(const char* extensionName) - { -- return extensions().contains(QLatin1String(extensionName)); -+ QList<QByteArray> extensions = -+ QByteArray(reinterpret_cast<const char *> -+ (eglQueryString(QEglContext::defaultDisplay(0), EGL_EXTENSIONS))).split(' '); -+ return extensions.contains(extensionName); - } - - QEglContext *QEglContext::currentContext(QEgl::API api) --- -1.6.5 -
recipes/qt4/qt-4.6.0/0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch deleted +0 -95
95 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch deleted +0 -146
146 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 92e9fcc25c62870c383c8558d576abc509a8c683 Mon Sep 17 00:00:00 2001 -From: Tom Cooksey <[email protected]> -Date: Fri, 4 Dec 2009 19:42:07 +0100 -Subject: [PATCH 0945/1244] Add EGL_BUFFER_SIZE to QEglProperties::reduceConfiguration() - -Reviewed-by: Trustme ---- - src/gui/egl/qeglproperties.cpp | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/src/gui/egl/qeglproperties.cpp b/src/gui/egl/qeglproperties.cpp -index 2d37edb..4d4410a 100644 ---- a/src/gui/egl/qeglproperties.cpp -+++ b/src/gui/egl/qeglproperties.cpp -@@ -229,6 +229,15 @@ void QEglProperties::setRenderableType(QEgl::API api) - // reductions in complexity are possible. - bool QEglProperties::reduceConfiguration() - { -+ // EGL chooses configs with the highest color depth over -+ // those with smaller (but faster) lower color depths. One -+ // way around this is to set EGL_BUFFER_SIZE to 16, which -+ // trumps the others. Of course, there may not be a 16-bit -+ // config avaliable, so it's the first restraint we remove. -+ if (value(EGL_BUFFER_SIZE) == 16) { -+ removeValue(EGL_BUFFER_SIZE); -+ return true; -+ } - if (removeValue(EGL_SAMPLE_BUFFERS)) { - removeValue(EGL_SAMPLES); - return true; --- -1.6.5 -
recipes/qt4/qt-4.6.0/0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch deleted +0 -180
180 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch deleted +0 -771
771 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch deleted +0 -68
68 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 05d4b4c72a5089885c1515833e34177607c2c511 Mon Sep 17 00:00:00 2001 -From: Rhys Weatherley <[email protected]> -Date: Tue, 8 Dec 2009 11:02:46 +1000 -Subject: [PATCH 0971/1244] Fix GL_BGRA formats under OpenGL/ES systems - -OpenGL/ES requires that the internal and external formats be the -same when calling glTexImage2D(). This caused problems with -devices that had the GL_EXT_bgra extension. - -This change makes the formats the same just before the upload and -also makes sure that the pixel type is GL_UNSIGNED_BYTE when -GL_BGRA is used. No change for desktop systems. - -Reviewed-by: Donald Carr ---- - src/opengl/qgl.cpp | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp -index 1ff102f..967ba48 100644 ---- a/src/opengl/qgl.cpp -+++ b/src/opengl/qgl.cpp -@@ -2234,6 +2234,14 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G - } - } - } -+#ifdef QT_OPENGL_ES -+ // OpenGL/ES requires that the internal and external formats be identical. -+ // This is typically used to convert GL_RGBA into GL_BGRA. -+ // Also, we need to use GL_UNSIGNED_BYTE when the format is GL_BGRA. -+ internalFormat = externalFormat; -+ if (pixel_type == GL_UNSIGNED_INT_8_8_8_8_REV) -+ pixel_type = GL_UNSIGNED_BYTE; -+#endif - #ifdef QGL_BIND_TEXTURE_DEBUG - printf(" - uploading, image.format=%d, externalFormat=0x%x, internalFormat=0x%x, pixel_type=0x%x\n", - img.format(), externalFormat, internalFormat, pixel_type); --- -1.6.5 -
recipes/qt4/qt-4.6.0/0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch deleted +0 -92
92 lines not on this page · raw message
recipes/qt4/qt-4.6.0/0992-Make-sure-a-context-is-current-when-loading-compress.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 51297287f1be5c31337203cbf5a0e3eae6047a88 Mon Sep 17 00:00:00 2001 -From: Rhys Weatherley <[email protected]> -Date: Wed, 9 Dec 2009 08:46:37 +1000 -Subject: [PATCH 0992/1244] Make sure a context is current when loading compressed textures. - -Reviewed-by: trustme ---- - src/opengl/qpixmapdata_gl.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp -index 0299cea..4e1d50d 100644 ---- a/src/opengl/qpixmapdata_gl.cpp -+++ b/src/opengl/qpixmapdata_gl.cpp -@@ -424,6 +424,7 @@ bool QGLPixmapData::fromFile(const QString &filename, const char *format, - resize(0, 0); - data = file.readAll(); - file.close(); -+ QGLShareContextScope ctx(qt_gl_share_widget()->context()); - QSize size = m_texture.bindCompressedTexture - (data.constData(), data.size(), format); - if (!size.isEmpty()) { -@@ -449,6 +450,7 @@ bool QGLPixmapData::fromData(const uchar *buffer, uint len, const char *format, - const char *buf = reinterpret_cast<const char *>(buffer); - if (m_texture.canBindCompressedTexture(buf, int(len), format, &alpha)) { - resize(0, 0); -+ QGLShareContextScope ctx(qt_gl_share_widget()->context()); - QSize size = m_texture.bindCompressedTexture(buf, int(len), format); - if (!size.isEmpty()) { - w = size.width(); --- -1.6.5 -
recipes/qt4/qt-4.6.0/0993-Fix-upside-down-PVR-compressed-textures.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 62fac41edfff5e42e4c3308376cb08e5d9a10afe Mon Sep 17 00:00:00 2001 -From: Rhys Weatherley <[email protected]> -Date: Wed, 9 Dec 2009 09:10:11 +1000 -Subject: [PATCH 0993/1244] Fix upside down PVR compressed textures. - -The "vertical flip" flag in the PVR format is the inverse of the -"inverted y" state that we use in Qt. - -Reviewed-by: trustme ---- - src/opengl/qgl.cpp | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp -index 967ba48..8003a29 100644 ---- a/src/opengl/qgl.cpp -+++ b/src/opengl/qgl.cpp -@@ -5363,11 +5363,12 @@ QSize QGLTexture::bindCompressedTexturePVR(const char *buf, int len) - // Restore the default pixel alignment for later texture uploads. - glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - -- // Set the invert flag for the texture. -+ // Set the invert flag for the texture. The "vertical flip" -+ // flag in PVR is the opposite sense to our sense of inversion. - if ((pvrHeader->flags & PVR_VERTICAL_FLIP) != 0) -- options |= QGLContext::InvertedYBindOption; -- else - options &= ~QGLContext::InvertedYBindOption; -+ else -+ options |= QGLContext::InvertedYBindOption; - - return QSize(pvrHeader->width, pvrHeader->height); - } --- -1.6.5 -
recipes/qt4/qt-4.6.0/0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From f59908d4a6edcd333a156d4c94ddbd9b30f7e810 Mon Sep 17 00:00:00 2001 -From: Rhys Weatherley <[email protected]> -Date: Wed, 9 Dec 2009 11:06:30 +1000 -Subject: [PATCH 0996/1244] Export QGLShareRegister because qgl_share_reg() is exported - -Reviewed-by: trustme ---- - src/opengl/qgl_p.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h -index 179d69a..615fb60 100644 ---- a/src/opengl/qgl_p.h -+++ b/src/opengl/qgl_p.h -@@ -397,7 +397,7 @@ public: - Q_DECLARE_OPERATORS_FOR_FLAGS(QGLExtensions::Extensions) - - --class Q_AUTOTEST_EXPORT QGLShareRegister -+class Q_OPENGL_EXPORT QGLShareRegister - { - public: - QGLShareRegister() {} --- -1.6.5 -
recipes/qt4/qt-4.6.0/0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 472c13edc85a6c7efef1e3b904333d0c9a5f9da6 Mon Sep 17 00:00:00 2001 -From: Anders Bakken <[email protected]> -Date: Thu, 3 Dec 2009 08:55:20 -0800 -Subject: [PATCH 0998/1244] Set stacking class for stays-on-top windows in DFB - -For better compatibility with non-QWS DirectFB apps running in the same -session we should set the stacking class of Windows that have the -StaysOnTop flag set. This corresponds nicely to DWSC_UPPER. - -Reviewed-by: Jervey Kong <[email protected]> ---- - .../gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp -index 021d52e..b79418a 100644 ---- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp -+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp -@@ -128,7 +128,6 @@ IDirectFBWindow *QDirectFBWindowSurface::directFBWindow() const - return (dfbWindow ? dfbWindow : (sibling ? sibling->dfbWindow : 0)); - } - -- - void QDirectFBWindowSurface::createWindow(const QRect &rect) - { - IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer(); -@@ -169,6 +168,9 @@ void QDirectFBWindowSurface::createWindow(const QRect &rect) - DirectFBErrorFatal("QDirectFBWindowSurface::createWindow", result); - - if (window()) { -+ if (window()->windowFlags() & Qt::WindowStaysOnTopHint) { -+ dfbWindow->SetStackingClass(dfbWindow, DWSC_UPPER); -+ } - DFBWindowID winid; - result = dfbWindow->GetID(dfbWindow, &winid); - if (result != DFB_OK) { --- -1.6.5 -
recipes/qt4/qt-4.6.0/0999-Enable-customizing-of-DirectFB-layer-to-use.patch deleted +0 -41
41 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch deleted +0 -46
46 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 6b29466ed7b5328ee61c1751bd4efb72f70946d3 Mon Sep 17 00:00:00 2001 -From: Tom Cooksey <[email protected]> -Date: Tue, 15 Dec 2009 17:26:37 +0100 -Subject: [PATCH 1115/1244] Fix QGLWidgets created with an alpha channel on X11/EGL - -If the QGLWidget's QGLFormat says it should have an alpha -channel, try to find an ARGB Visual. - -Reviewed-By: Trond -Task-number: QT-2602 ---- - src/opengl/qgl_x11egl.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp -index b10e7e9..19026b3 100644 ---- a/src/opengl/qgl_x11egl.cpp -+++ b/src/opengl/qgl_x11egl.cpp -@@ -336,7 +336,7 @@ void QGLWidget::setContext(QGLContext *context, const QGLContext* shareContext, - // If the application has set WA_TranslucentBackground and not explicitly set - // the alpha buffer size to zero, modify the format so it have an alpha channel - QGLFormat& fmt = d->glcx->d_func()->glFormat; -- const bool tryArgbVisual = testAttribute(Qt::WA_TranslucentBackground); -+ const bool tryArgbVisual = testAttribute(Qt::WA_TranslucentBackground) || fmt.alpha(); - if (tryArgbVisual && fmt.alphaBufferSize() == -1) - fmt.setAlphaBufferSize(1); - --- -1.6.5 -
recipes/qt4/qt-4.6.0/1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch deleted +0 -116
116 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch deleted +0 -54
54 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch deleted +0 -307
307 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch deleted +0 -45
45 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1165-NEON-configure-detection-and-initial-blend-function-.patch deleted +0 -593
371 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch deleted +0 -60
60 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch deleted +0 -121
121 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch deleted +0 -269
269 lines not on this page · raw message
recipes/qt4/qt-4.6.0/1205-Fix-text-rendering-on-GL2-paint-engine.patch deleted +0 -83
83 lines not on this page · raw message
recipes/qt4/qt4-embedded-4.6.0/0006-freetype-host-includes.patch deleted +0 -20
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-embedded-4.6.0/0008-qt-lib-infix.patch deleted +0 -32
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch deleted +0 -11
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-embedded-4.6.0/linux.conf deleted +0 -54
54 lines not on this page · raw message
recipes/qt4/qt4-embedded-gles_4.6.0.bb deleted +0 -13
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-embedded_4.6.0.bb deleted +0 -5
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-tools-native_4.6.0.bb deleted +0 -12
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-tools-sdk_4.6.0.bb deleted +0 -77
77 lines not on this page · raw message
recipes/qt4/qt4-x11-free-4.6.0/0008-qt-lib-infix.patch deleted +0 -32
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch deleted +0 -11
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-x11-free-4.6.0/linux.conf deleted +0 -54
54 lines not on this page · raw message
recipes/qt4/qt4-x11-free-gles_4.6.0.bb deleted +0 -17
Lines of this file are not shown. View the raw message.
recipes/qt4/qt4-x11-free_4.6.0.bb deleted +0 -9
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.3.3
Part of the diff is not shown here. View the raw message.
PATCH 2/4 qt4.6: remove 4.6.2
--- recipes/qt4/qt-4.6.2.inc | 72 ----------------- .../0006-freetype-host-includes.patch | 20 ----- .../qt4/qt4-embedded-4.6.2/0008-qt-lib-infix.patch | 32 -------- .../0010-no-simpledecoration-example.patch | 11 --- recipes/qt4/qt4-embedded-4.6.2/linux.conf | 54 ------------ .../qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff | 34 -------- recipes/qt4/qt4-embedded-gles_4.6.2.bb | 14 --- recipes/qt4/qt4-embedded_4.6.2.bb | 7 -- recipes/qt4/qt4-tools-native_4.6.2.bb | 12 --- recipes/qt4/qt4-tools-sdk_4.6.2.bb | 85 -------------------- .../qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch | 32 -------- .../0010-no-simpledecoration-example.patch | 11 --- recipes/qt4/qt4-x11-free-4.6.2/linux.conf | 54 ------------ recipes/qt4/qt4-x11-free-gles_4.6.2.bb | 17 ---- recipes/qt4/qt4-x11-free_4.6.2.bb | 11 --- 15 files changed, 0 insertions(+), 466 deletions(-) delete mode 100644 recipes/qt4/qt-4.6.2.inc delete mode 100644 recipes/qt4/qt4-embedded-4.6.2/0006-freetype-host-includes.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.2/0008-qt-lib-infix.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.2/0010-no-simpledecoration-example.patch delete mode 100644 recipes/qt4/qt4-embedded-4.6.2/linux.conf delete mode 100644 recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff delete mode 100644 recipes/qt4/qt4-embedded-gles_4.6.2.bb delete mode 100644 recipes/qt4/qt4-embedded_4.6.2.bb delete mode 100644 recipes/qt4/qt4-tools-native_4.6.2.bb delete mode 100644 recipes/qt4/qt4-tools-sdk_4.6.2.bb delete mode 100644 recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch delete mode 100644 recipes/qt4/qt4-x11-free-4.6.2/0010-no-simpledecoration-example.patch delete mode 100644 recipes/qt4/qt4-x11-free-4.6.2/linux.conf delete mode 100644 recipes/qt4/qt4-x11-free-gles_4.6.2.bb delete mode 100644 recipes/qt4/qt4-x11-free_4.6.2.bb
recipes/qt4/qt-4.6.2.inc deleted +0 -72
@@ -1,72 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -FILESPATHPKG .= ":qt-${PV}" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch \ - file://0002-fix-resinit-declaration.patch \ - file://0004-no-qmake.patch \ - file://0006-freetype-host-includes.patch \ - file://0008-qt-lib-infix.patch \ - file://0009-support-2bpp.patch \ - file://0010-no-simpledecoration-example.patch \ - file://fix-config-tests.patch \ - file://qt-config.patch \ - file://g++.conf \ - file://linux.conf \ - " - -# Set necessary variables in the profile -SRC_URI += "file://qte.sh" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -do_configure_prepend() { - for pro in $(find ${S} -name "*.pro") ; do - sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro - done - - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_configure_append() { - sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile -} - -QT_GLFLAGS ?= "" -QT_CONFIG_FLAGS += " -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" - -do_compile() { - # Fixup missing wsegl header in some SGX SDKs - if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then - cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ - fi - - unset CFLAGS CXXFLAGS - oe_runmake ${EXTRA_ENV} -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done - - #Append an E to the qtdemo file - if [ -n "${QT_LIBINFIX}" ] ; then - mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} - fi -} - -LICENSE = "LGPLv2.1 GPLv3" -SRC_URI += " \ - file://hack-out-pg_config.patch" - -SRC_URI[md5sum] = "eb651ee4b157c01696aa56777fc6e0e5" -SRC_URI[sha256sum] = "176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae"
recipes/qt4/qt4-embedded-4.6.2/0006-freetype-host-includes.patch deleted +0 -20
@@ -1,20 +0,0 @@ -From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 -From: Michael Krelin <[email protected]> -Date: Mon, 4 Jun 2007 14:48:50 +0200 -Subject: [PATCH] freetype host includes - ---- - config.tests/unix/freetype/freetype.pri | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri 2009-02-25 22:32:32.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri 2009-03-26 17:14:16.000000000 +0100 -@@ -1,5 +1,5 @@ - !cross_compile { -- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH -+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - # LSB doesn't allow using headers from /include or /usr/include - linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - for(p, TRY_INCLUDEPATHS) {
recipes/qt4/qt4-embedded-4.6.2/0008-qt-lib-infix.patch deleted +0 -32
@@ -1,32 +0,0 @@ ---- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 -@@ -3,11 +3,11 @@ - - # Include the correct version of the UiLoader library - symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib --else: QTUITOOLS_LINKAGE = -lQtUiTools -+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} - - CONFIG(debug, debug|release) { -- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug -- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd -+ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug -+ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d - } - LIBS += $$QTUITOOLS_LINKAGE - ---- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 -@@ -1,5 +1,5 @@ - TEMPLATE = lib --TARGET = $$qtLibraryTarget(QtUiTools) -+TARGET = QtUiTools - QT += xml - CONFIG += qt staticlib - DESTDIR = ../../../../lib -@@ -43,3 +43,5 @@ - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_PKGCONFIG_REQUIRES += QtXml - } -+ -+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
recipes/qt4/qt4-embedded-4.6.2/0010-no-simpledecoration-example.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 -@@ -1,7 +1,7 @@ - TEMPLATE = subdirs - # no /dev/fbX - !qnx:!vxworks:SUBDIRS = framebuffer --SUBDIRS += mousecalibration simpledecoration -+SUBDIRS += mousecalibration - - # install - sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
recipes/qt4/qt4-embedded-4.6.2/linux.conf deleted +0 -54
54 lines not on this page · raw message
recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff deleted +0 -34
@@ -1,34 +0,0 @@ -Patch originally done by Bin Liu, rediffed by Koen Kooi for Qt 4.6.2 - -This patch is a first step to get a working cursor when using the powervr driver, it flickers when hovering over a QGLWidget, but still better than no cursor at all - ---- /tmp/pvreglscreen.cpp 2010-04-19 09:30:32.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.2/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp 2010-04-19 09:31:30.000000000 +0200 -@@ -85,6 +85,9 @@ - bool PvrEglScreen::initDevice() - { - openTty(); -+#ifndef QT_NO_QWS_CURSOR -+ QScreenCursor::initSoftwareCursor(); -+#endif - return true; - } - ---- /tmp/qwindowsystem_qws.cpp 2010-04-19 09:32:47.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.2/src/gui/embedded/qwindowsystem_qws.cpp 2010-04-19 09:33:30.000000000 +0200 -@@ -3501,7 +3501,6 @@ - } - - #ifdef QT_QWS_CLIENTBLIT --#ifdef QT_NO_QWS_CURSOR - // This optimization only really works when there isn't a crazy cursor - // wizzing around. - QRegion directPaint = (r - transparentRegion); // in gloal coords -@@ -3513,7 +3512,6 @@ - QWSRegionEvent::DirectPaint, id); - } - #endif --#endif - } - - if (doLock)
recipes/qt4/qt4-embedded-gles_4.6.2.bb deleted +0 -14
@@ -1,14 +0,0 @@ -require qt4-embedded.inc -PR = "${INC_PR}.8" - -PROVIDES += "qt4-embedded" -QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr" - -require qt-${PV}.inc - -SRC_URI += "file://cursor-hack.diff" - -FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" - -DEPENDS += "virtual/egl" -require recipes/egl/egl.inc
recipes/qt4/qt4-embedded_4.6.2.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require qt4-embedded.inc - -PR = "${INC_PR}.1" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -require qt-${PV}.inc
recipes/qt4/qt4-tools-native_4.6.2.bb deleted +0 -12
@@ -1,12 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-tools-native.inc -LICENSE = "LGPLv2.1 GPLv3" -PR = "${INC_PR}.0" - -EXTRA_OECONF += " -no-fast -silent -no-rpath" - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "eb651ee4b157c01696aa56777fc6e0e5" -SRC_URI[sha256sum] = "176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae"
recipes/qt4/qt4-tools-sdk_4.6.2.bb deleted +0 -85
85 lines not on this page · raw message
recipes/qt4/qt4-x11-free-4.6.2/0008-qt-lib-infix.patch deleted +0 -32
@@ -1,32 +0,0 @@ ---- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 -@@ -3,11 +3,11 @@ - - # Include the correct version of the UiLoader library - symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib --else: QTUITOOLS_LINKAGE = -lQtUiTools -+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} - - CONFIG(debug, debug|release) { -- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug -- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd -+ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug -+ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d - } - LIBS += $$QTUITOOLS_LINKAGE - ---- /tmp/uitools.pro 2009-12-01 18:40:28.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro 2009-12-01 18:59:18.000000000 +0100 -@@ -1,5 +1,5 @@ - TEMPLATE = lib --TARGET = $$qtLibraryTarget(QtUiTools) -+TARGET = QtUiTools - QT += xml - CONFIG += qt staticlib - DESTDIR = ../../../../lib -@@ -43,3 +43,5 @@ - QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_PKGCONFIG_REQUIRES += QtXml - } -+ -+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
recipes/qt4/qt4-x11-free-4.6.2/0010-no-simpledecoration-example.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 -@@ -1,7 +1,7 @@ - TEMPLATE = subdirs - # no /dev/fbX - !qnx:!vxworks:SUBDIRS = framebuffer --SUBDIRS += mousecalibration simpledecoration -+SUBDIRS += mousecalibration - - # install - sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
recipes/qt4/qt4-x11-free-4.6.2/linux.conf deleted +0 -54
54 lines not on this page · raw message
recipes/qt4/qt4-x11-free-gles_4.6.2.bb deleted +0 -17
@@ -1,17 +0,0 @@ -require qt4-x11-free.inc -PR = "${INC_PR}.7" - -QT_GLFLAGS = "-opengl es2 -depths 16,24,32 " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -no-embedded \ - -xrandr \ - -x11" - -FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" - -DEPENDS += "virtual/egl" -require recipes/egl/egl.inc -PROVIDES += "qt4-x11-free"
recipes/qt4/qt4-x11-free_4.6.2.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require qt4-x11-free.inc -PR = "${INC_PR}.2" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -no-embedded \ - -xrandr \ - -x11"
Signature · 1 line
1.6.3.3