qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
parent
775d77e482
commit
c908fe4ebd
|
|
@ -1,7 +1,7 @@
|
|||
# Select which version you prefer by defining QT5_VERSION and including this file
|
||||
# possible values now "5.1.1", "5.1.0+git%"
|
||||
# possible values now "5.2.0", "5.2.0+git%"
|
||||
|
||||
QT5_VERSION ?= "5.1.1"
|
||||
QT5_VERSION ?= "5.2.0"
|
||||
|
||||
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
|
||||
|
|
@ -14,6 +14,7 @@ PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}"
|
|||
PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qtsensors = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qtserialport = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
|
||||
PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
|
||||
|
|
|
|||
|
|
@ -7,32 +7,28 @@ QT_MODULE = "qtbase"
|
|||
|
||||
require nativesdk-qt5.inc
|
||||
|
||||
# shared with target version
|
||||
SRC_URI += " \
|
||||
# common with -native and target version
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
|
||||
file://0003-Add-external-hostbindir-option.patch \
|
||||
file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
|
||||
file://0006-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||
file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0008-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0009-qt_module-Fix-paths-in-.prl-files.patch \
|
||||
file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0013-Disable-mkv8snapshot.patch \
|
||||
file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
|
||||
file://0015-qtbase-allow-build-of-examples.patch \
|
||||
file://0021-configure-make-pulseaudio-a-configurable-option.patch \
|
||||
file://0022-configure-make-alsa-a-configurable-option.patch \
|
||||
file://0023-configure-make-freetype-a-configurable-option.patch \
|
||||
file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
|
||||
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0005-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
|
||||
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
|
||||
"
|
||||
|
||||
# common with -native
|
||||
SRC_URI += " \
|
||||
file://0010-Always-build-uic.patch \
|
||||
"
|
||||
|
||||
# specific for nativesdk version
|
||||
SRC_URI += " \
|
||||
file://0001-Always-build-uic.patch \
|
||||
file://0001-configure-preserve-built-qmake-and-swap-with-native-.patch \
|
||||
file://0001-configure-bump-path-length-from-256-to-512-character.patch \
|
||||
file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \
|
||||
file://0012-configure-bump-path-length-from-256-to-512-character.patch \
|
||||
"
|
||||
|
||||
PACKAGES = "${PN}-tools-dbg ${PN}-tools"
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd"
|
||||
SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
|
||||
SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools-${PV}:"
|
||||
|
||||
SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781"
|
||||
SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
|
||||
SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"
|
||||
|
|
@ -1,16 +1,14 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
# last tag before this SRCREV is 5.0.0-beta1
|
||||
PV = "4.999+5.0.0-beta1+git${SRCPV}"
|
||||
|
||||
QT_MODULE_BRANCH = "master"
|
||||
|
||||
SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058"
|
||||
# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
|
||||
SRCREV = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9"
|
||||
|
||||
do_configure_prepend() {
|
||||
# Temporary hack to get qt3d build for Qt 5.1.0
|
||||
if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
|
||||
echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf
|
||||
echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
QT_VERSION ?= "${PV}"
|
||||
|
||||
# it's different for RC versions
|
||||
QT_VERSION_DIR ?= "5.1"
|
||||
QT_VERSION_DIR ?= "5.2"
|
||||
|
||||
SRC_URI += " \
|
||||
http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
|
||||
|
|
@ -10,7 +10,7 @@ SRC_URI += " \
|
|||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.1.0+git${SRCPV}"
|
||||
PV = "5.2.0+git${SRCPV}"
|
||||
|
||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
|
||||
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ FILES_${PN}-qmlplugins = " \
|
|||
${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*.js \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*.png \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
|
||||
|
|
|
|||
|
|
@ -1,304 +0,0 @@
|
|||
From b91e232e603df102a1d305aceb0dbedc6ce3e89c 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 01/22] Add linux-oe-g++ platform
|
||||
|
||||
* This qmake.conf unlike other platforms reads most variables from
|
||||
shell environment, because it's easier for qt recipes to export
|
||||
*FLAGS or CC specific for given recipe
|
||||
|
||||
* configure: add getQEvalMakeConf and getXQEvalMakeConf
|
||||
Allow expansion of $(...) references from qmake.conf to generate
|
||||
qmake environment from shell environment as exported by qmake5_base
|
||||
|
||||
* OE_QMAKE_CXX in order to allow compiler version check to succeed
|
||||
which allows WebKit to be enabled.
|
||||
|
||||
* Other variables in order to let config.tests to use our -platform
|
||||
settings
|
||||
|
||||
* Add setBootstrapEvalVariable to bootstrap qmake with our environment
|
||||
too, this allows us to use -platform linux-oe-g++ also for native
|
||||
recipe
|
||||
|
||||
* disable gdb_dwarf_index
|
||||
* qmake is trying to call native gdb and we don't depend on gdb-native
|
||||
(or even provide gdb-native)
|
||||
* fixes errors like this:
|
||||
/bin/sh: gdb: command not found
|
||||
/bin/sh: line 0: test: -gt: unary operator expected
|
||||
which are not fatal, but still misleading in do_configure output
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 54 ++++++++++++++++---
|
||||
mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
|
||||
mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
|
||||
3 files changed, 187 insertions(+), 7 deletions(-)
|
||||
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
|
||||
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 140c7b4..397d53f 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -291,6 +291,16 @@ getQMakeConf()
|
||||
getSingleQMakeVariable "$1" "$specvals"
|
||||
}
|
||||
|
||||
+# OE qmake.conf is reading some variables from shell env
|
||||
+# read them from qmake.conf, replace qmake () syntax with shell and eval
|
||||
+getQEvalMakeConf()
|
||||
+{
|
||||
+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
|
||||
+ EVAL=`eval "echo ${VAL}"`
|
||||
+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
|
||||
+ eval "echo ${VAL}"
|
||||
+}
|
||||
+
|
||||
getXQMakeConf()
|
||||
{
|
||||
if [ -z "$xspecvals" ]; then
|
||||
@@ -300,6 +310,16 @@ getXQMakeConf()
|
||||
getSingleQMakeVariable "$1" "$xspecvals"
|
||||
}
|
||||
|
||||
+# OE qmake.conf is reading some variables from shell env
|
||||
+# read them from qmake.conf, replace qmake () syntax with shell and eval
|
||||
+getXQEvalMakeConf()
|
||||
+{
|
||||
+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
|
||||
+ EVAL=`eval "echo ${VAL}"`
|
||||
+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
|
||||
+ eval "echo ${VAL}"
|
||||
+}
|
||||
+
|
||||
compilerSupportsFlag()
|
||||
{
|
||||
cat >conftest.cpp <<EOF
|
||||
@@ -816,6 +836,18 @@ fi
|
||||
# initalize variables
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
+# Export all OE variables for qmake.conf from shell env to QMakeVars
|
||||
+OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
|
||||
+for varname in $OE_VARIABLES; do
|
||||
+ qmakevarname="${varname}"
|
||||
+ cmd=`echo \
|
||||
+'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
|
||||
+ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
|
||||
+# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
|
||||
+fi'`
|
||||
+ eval "$cmd"
|
||||
+done
|
||||
+
|
||||
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||
for varname in $SYSTEM_VARIABLES; do
|
||||
qmakevarname="${varname}"
|
||||
@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
|
||||
CFG_QGTKSTYLE=no
|
||||
fi
|
||||
|
||||
-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
|
||||
+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
|
||||
|
||||
TEST_COMPILER=$QMAKE_CONF_COMPILER
|
||||
|
||||
@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
|
||||
+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
|
||||
|
||||
GCC_MACHINE_DUMP=
|
||||
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
|
||||
@@ -3959,6 +3991,14 @@ setBootstrapVariable()
|
||||
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
|
||||
}
|
||||
|
||||
+# OE qmake.conf is reading some variables from shell env
|
||||
+# read them from qmake.conf, replace qmake () syntax with shell and eval
|
||||
+setBootstrapEvalVariable()
|
||||
+{
|
||||
+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
|
||||
+}
|
||||
+
|
||||
+
|
||||
# build qmake
|
||||
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
echo "Creating qmake..."
|
||||
@@ -3997,11 +4037,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
fi
|
||||
|
||||
[ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
|
||||
- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
|
||||
- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
|
||||
- setBootstrapVariable QMAKE_CFLAGS
|
||||
- setBootstrapVariable QMAKE_CXXFLAGS
|
||||
- setBootstrapVariable QMAKE_LFLAGS
|
||||
+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
|
||||
+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
|
||||
+ setBootstrapEvalVariable QMAKE_CFLAGS
|
||||
+ setBootstrapEvalVariable QMAKE_CXXFLAGS
|
||||
+ setBootstrapEvalVariable QMAKE_LFLAGS
|
||||
|
||||
if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
|
||||
setBootstrapVariable QMAKE_CFLAGS_RELEASE
|
||||
diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
|
||||
new file mode 100644
|
||||
index 0000000..ca26b10
|
||||
--- /dev/null
|
||||
+++ b/mkspecs/linux-oe-g++/qmake.conf
|
||||
@@ -0,0 +1,40 @@
|
||||
+#
|
||||
+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
|
||||
+#
|
||||
+
|
||||
+MAKEFILE_GENERATOR = UNIX
|
||||
+CONFIG += incremental
|
||||
+QMAKE_INCREMENTAL_STYLE = sublib
|
||||
+
|
||||
+include(../common/linux.conf)
|
||||
+
|
||||
+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
|
||||
+QMAKE_AR = $(OE_QMAKE_AR) cqs
|
||||
+QMAKE_STRIP = $(OE_QMAKE_STRIP)
|
||||
+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
|
||||
+
|
||||
+include(../common/gcc-base-unix.conf)
|
||||
+
|
||||
+# *FLAGS from gcc-base.conf
|
||||
+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
|
||||
+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
|
||||
+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
|
||||
+
|
||||
+include(../common/g++-unix.conf)
|
||||
+
|
||||
+# tc settings from g++-base.conf
|
||||
+QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
|
||||
+QMAKE_CC = $(OE_QMAKE_CC)
|
||||
+QMAKE_CXX = $(OE_QMAKE_CXX)
|
||||
+
|
||||
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
|
||||
+
|
||||
+QMAKE_LINK = $(OE_QMAKE_LINK)
|
||||
+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
|
||||
+QMAKE_LINK_C = $(OE_QMAKE_LINK)
|
||||
+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
|
||||
+
|
||||
+# for the SDK
|
||||
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
|
||||
+
|
||||
+load(qt_config)
|
||||
diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
|
||||
new file mode 100644
|
||||
index 0000000..dd12003
|
||||
--- /dev/null
|
||||
+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
|
||||
@@ -0,0 +1,100 @@
|
||||
+/****************************************************************************
|
||||
+**
|
||||
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
+** Contact: http://www.qt-project.org/legal
|
||||
+**
|
||||
+** This file is part of the qmake spec of the Qt Toolkit.
|
||||
+**
|
||||
+** $QT_BEGIN_LICENSE:LGPL$
|
||||
+** Commercial License Usage
|
||||
+** Licensees holding valid commercial Qt licenses may use this file in
|
||||
+** accordance with the commercial license agreement provided with the
|
||||
+** Software or, alternatively, in accordance with the terms contained in
|
||||
+** a written agreement between you and Digia. For licensing terms and
|
||||
+** conditions see http://qt.digia.com/licensing. For further information
|
||||
+** use the contact form at http://qt.digia.com/contact-us.
|
||||
+**
|
||||
+** GNU Lesser General Public License Usage
|
||||
+** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
+** General Public License version 2.1 as published by the Free Software
|
||||
+** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
+** packaging of this file. Please review the following information to
|
||||
+** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
+**
|
||||
+** In addition, as a special exception, Digia gives you certain additional
|
||||
+** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
+**
|
||||
+** GNU General Public License Usage
|
||||
+** Alternatively, this file may be used under the terms of the GNU
|
||||
+** General Public License version 3.0 as published by the Free Software
|
||||
+** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
+** packaging of this file. Please review the following information to
|
||||
+** ensure the GNU General Public License version 3.0 requirements will be
|
||||
+** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
+**
|
||||
+**
|
||||
+** $QT_END_LICENSE$
|
||||
+**
|
||||
+****************************************************************************/
|
||||
+
|
||||
+#ifndef QPLATFORMDEFS_H
|
||||
+#define QPLATFORMDEFS_H
|
||||
+
|
||||
+// Get Qt defines/settings
|
||||
+
|
||||
+#include "qglobal.h"
|
||||
+
|
||||
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
|
||||
+
|
||||
+// 1) need to reset default environment if _BSD_SOURCE is defined
|
||||
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
|
||||
+// 3) it seems older glibc need this to include the X/Open stuff
|
||||
+#ifndef _GNU_SOURCE
|
||||
+# define _GNU_SOURCE
|
||||
+#endif
|
||||
+
|
||||
+#include <unistd.h>
|
||||
+
|
||||
+
|
||||
+// We are hot - unistd.h should have turned on the specific APIs we requested
|
||||
+
|
||||
+#include <features.h>
|
||||
+#include <pthread.h>
|
||||
+#include <dirent.h>
|
||||
+#include <fcntl.h>
|
||||
+#include <grp.h>
|
||||
+#include <pwd.h>
|
||||
+#include <signal.h>
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <sys/ipc.h>
|
||||
+#include <sys/time.h>
|
||||
+#include <sys/shm.h>
|
||||
+#include <sys/socket.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <sys/wait.h>
|
||||
+#include <netinet/in.h>
|
||||
+#ifndef QT_NO_IPV6IFNAME
|
||||
+#include <net/if.h>
|
||||
+#endif
|
||||
+
|
||||
+#define QT_USE_XOPEN_LFS_EXTENSIONS
|
||||
+#include "../common/posix/qplatformdefs.h"
|
||||
+
|
||||
+#undef QT_SOCKLEN_T
|
||||
+
|
||||
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
|
||||
+#define QT_SOCKLEN_T socklen_t
|
||||
+#else
|
||||
+#define QT_SOCKLEN_T int
|
||||
+#endif
|
||||
+
|
||||
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
|
||||
+#define QT_SNPRINTF ::snprintf
|
||||
+#define QT_VSNPRINTF ::vsnprintf
|
||||
+#endif
|
||||
+
|
||||
+#endif // QPLATFORMDEFS_H
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From f794542b10ccbf9c4cecaf23cf24658d64594cf3 Mon Sep 17 00:00:00 2001
|
||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Date: Tue, 27 Nov 2012 12:46:44 -0800
|
||||
Subject: [PATCH 22/22] Always build uic
|
||||
|
||||
Even if we are not building gui or widgets. This tool is needed later
|
||||
as a native tool when compiling the target.
|
||||
|
||||
Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/src.pro | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index b4c9602..f30ec1f 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
|
||||
contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
|
||||
src_plugins.depends += src_gui src_platformsupport
|
||||
!contains(QT_CONFIG, no-widgets) {
|
||||
- SUBDIRS += src_tools_uic src_widgets
|
||||
+ SUBDIRS += src_widgets
|
||||
src_plugins.depends += src_widgets
|
||||
contains(QT_CONFIG, opengl(es1|es2)?) {
|
||||
SUBDIRS += src_opengl
|
||||
@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
|
||||
}
|
||||
}
|
||||
}
|
||||
-SUBDIRS += src_plugins src_tools_qdoc
|
||||
+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
|
||||
|
||||
nacl: SUBDIRS -= src_network src_testlib
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From a899fba459928c7e5196f15dcea4d561807dc825 Mon Sep 17 00:00:00 2001
|
||||
From: Holger Freyther <zecke@selfish.org>
|
||||
Date: Wed, 26 Sep 2012 17:22:30 +0200
|
||||
Subject: [PATCH 02/22] qlibraryinfo: allow to set qt.conf from the outside
|
||||
using the environment
|
||||
|
||||
Allow to set a qt.conf from the outside using the environment. This allows
|
||||
to inject new prefixes and other paths into qmake. This is needed when using
|
||||
the same qmake binary to build qt/x11 and qt/embedded
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/corelib/global/qlibraryinfo.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||
index 53a3ebb..8ca2102 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||
@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
|
||||
|
||||
QSettings *QLibraryInfoPrivate::findConfiguration()
|
||||
{
|
||||
- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
|
||||
+ QByteArray config = getenv("QT_CONF_PATH");
|
||||
+ QString qtconfig = QFile::decodeName(config);
|
||||
+ if(!QFile::exists(qtconfig))
|
||||
+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
|
||||
#ifdef QT_BOOTSTRAPPED
|
||||
if(!QFile::exists(qtconfig))
|
||||
qtconfig = qt_libraryInfoFile();
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,219 +0,0 @@
|
|||
From 062621e0310eddb448ebcc27fc4c1507c2d6e30d 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 03/22] Add -external-hostbindir option
|
||||
|
||||
* when cross-compiling it's sometimes useful to use existing tools from machine
|
||||
(or in OpenEmbedded built with separate native recipe) when building for target
|
||||
|
||||
* this way we can skip bootstraping tools we already have
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 16 +++++++++++++++-
|
||||
mkspecs/features/qt_functions.prf | 5 ++++-
|
||||
mkspecs/features/qt_tool.prf | 2 +-
|
||||
qmake/property.cpp | 1 +
|
||||
qtbase.pro | 12 +++++++++---
|
||||
src/corelib/global/qlibraryinfo.cpp | 3 ++-
|
||||
src/corelib/global/qlibraryinfo.h | 1 +
|
||||
tools/configure/configureapp.cpp | 8 ++++++++
|
||||
8 files changed, 41 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 397d53f..80bdd7a 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX=
|
||||
QT_HOST_BINS=
|
||||
QT_HOST_LIBS=
|
||||
QT_HOST_DATA=
|
||||
+QT_EXTERNAL_HOST_BINS=
|
||||
|
||||
#flags for SQL drivers
|
||||
QT_CFLAGS_PSQL=
|
||||
@@ -1191,7 +1192,8 @@ while [ "$#" -gt 0 ]; do
|
||||
-android-ndk-platform| \
|
||||
-android-ndk-host| \
|
||||
-android-arch| \
|
||||
- -android-toolchain-version)
|
||||
+ -android-toolchain-version| \
|
||||
+ -external-hostbindir)
|
||||
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
|
||||
shift
|
||||
VAL="$1"
|
||||
@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do
|
||||
hostlibdir)
|
||||
QT_HOST_LIBS="$VAL"
|
||||
;;
|
||||
+ external-hostbindir)
|
||||
+ QT_EXTERNAL_HOST_BINS="$VAL"
|
||||
+ ;;
|
||||
pkg-config)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_PKGCONFIG="$VAL"
|
||||
@@ -3240,6 +3245,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
|
||||
QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
|
||||
fi
|
||||
|
||||
+# default is empty, don't call makeabs if it is empty
|
||||
+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
|
||||
+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
|
||||
+fi
|
||||
+
|
||||
#-------------------------------------------------------------------------------
|
||||
# help - interactive parts of the script _after_ this section please
|
||||
#-------------------------------------------------------------------------------
|
||||
@@ -3408,6 +3418,9 @@ Installation options:
|
||||
-hostdatadir <dir> . Data used by qmake will be installed to <dir>
|
||||
(default HOSTPREFIX)
|
||||
|
||||
+ -external-hostbindir <dir> Use external host executables instead of building them
|
||||
+ (not used by defaut)
|
||||
+
|
||||
Configure options:
|
||||
|
||||
The defaults (*) are usually acceptable. A plus (+) denotes a default value
|
||||
@@ -3923,6 +3936,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
|
||||
"qt_hbinpath=$QT_HOST_BINS",
|
||||
"qt_hlibpath=$QT_HOST_LIBS",
|
||||
"qt_hdatpath=$QT_HOST_DATA",
|
||||
+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
|
||||
"qt_targspec=$shortxspec",
|
||||
"qt_hostspec=$shortspec",
|
||||
#endif
|
||||
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
|
||||
index 2f2c94c..4e12d3d 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) {
|
||||
defineTest(qtPrepareTool) {
|
||||
$$1 = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty($$1) {
|
||||
- $$1 = $$[QT_HOST_BINS]/$$2
|
||||
+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
|
||||
+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+ $$1 = $$[QT_HOST_BINS]/$$2
|
||||
+ }
|
||||
exists($$eval($$1).pl) {
|
||||
$$1 = perl -w $$eval($$1).pl
|
||||
} else: contains(QMAKE_HOST.os, Windows) {
|
||||
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
|
||||
index 9a6b963..83ef3a0 100644
|
||||
--- a/mkspecs/features/qt_tool.prf
|
||||
+++ b/mkspecs/features/qt_tool.prf
|
||||
@@ -16,7 +16,7 @@ CONFIG += console
|
||||
# If we are doing a prefix build, create a "module" pri which enables
|
||||
# qtPrepareTool() to work with the non-installed build.
|
||||
# Non-bootstrapped tools always need this because of the environment setup.
|
||||
-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
|
||||
+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
isEmpty(MODULE):MODULE = $$TARGET
|
||||
|
||||
!host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
|
||||
diff --git a/qmake/property.cpp b/qmake/property.cpp
|
||||
index 4685440..93eb1d4 100644
|
||||
--- a/qmake/property.cpp
|
||||
+++ b/qmake/property.cpp
|
||||
@@ -75,6 +75,7 @@ static const struct {
|
||||
{ "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
|
||||
{ "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
|
||||
{ "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
|
||||
+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
|
||||
{ "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
|
||||
{ "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
|
||||
};
|
||||
diff --git a/qtbase.pro b/qtbase.pro
|
||||
index d6726b5..28ca7d5 100644
|
||||
--- a/qtbase.pro
|
||||
+++ b/qtbase.pro
|
||||
@@ -70,16 +70,22 @@ CONFIG -= qt
|
||||
|
||||
#qmake
|
||||
qmake.path = $$[QT_HOST_BINS]
|
||||
+qmake.files = $$OUT_PWD/bin/qmake
|
||||
+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
|
||||
+}
|
||||
equals(QMAKE_HOST.os, Windows) {
|
||||
- qmake.files = $$OUT_PWD/bin/qmake.exe
|
||||
-} else {
|
||||
- qmake.files = $$OUT_PWD/bin/qmake
|
||||
+ qmake.files = $${qmake.files}.exe
|
||||
}
|
||||
INSTALLS += qmake
|
||||
|
||||
#syncqt
|
||||
syncqt.path = $$[QT_HOST_BINS]
|
||||
syncqt.files = $$PWD/bin/syncqt.pl
|
||||
+syncqt.files = $$PWD/bin/syncqt.pl
|
||||
+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
|
||||
+}
|
||||
INSTALLS += syncqt
|
||||
|
||||
# If we are doing a prefix build, create a "module" pri which enables
|
||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||
index 8ca2102..9f5d444 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||
@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
|
||||
*/
|
||||
|
||||
static const struct {
|
||||
- char key[19], value[13];
|
||||
+ char key[21], value[13];
|
||||
} qtConfEntries[] = {
|
||||
{ "Prefix", "." },
|
||||
{ "Documentation", "doc" }, // should be ${Data}/doc
|
||||
@@ -296,6 +296,7 @@ static const struct {
|
||||
{ "HostBinaries", "bin" },
|
||||
{ "HostLibraries", "lib" },
|
||||
{ "HostData", "." },
|
||||
+ { "ExternalHostBinaries", "" },
|
||||
{ "TargetSpec", "" },
|
||||
{ "HostSpec", "" },
|
||||
#endif
|
||||
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
|
||||
index b275e01..0e6baed 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.h
|
||||
+++ b/src/corelib/global/qlibraryinfo.h
|
||||
@@ -84,6 +84,7 @@ public:
|
||||
HostBinariesPath,
|
||||
HostLibrariesPath,
|
||||
HostDataPath,
|
||||
+ ExternalHostBinariesPath,
|
||||
TargetSpecPath,
|
||||
HostSpecPath,
|
||||
LastHostPath = HostSpecPath,
|
||||
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
|
||||
index a6376bb..aed85ce 100644
|
||||
--- a/tools/configure/configureapp.cpp
|
||||
+++ b/tools/configure/configureapp.cpp
|
||||
@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine()
|
||||
dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
|
||||
}
|
||||
|
||||
+ else if (configCmdLine.at(i) == "-external-hostbindir") {
|
||||
+ ++i;
|
||||
+ if (i == argCount)
|
||||
+ break;
|
||||
+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
|
||||
+ }
|
||||
+
|
||||
else if (configCmdLine.at(i) == "-make-tool") {
|
||||
++i;
|
||||
if (i == argCount)
|
||||
@@ -3708,6 +3715,7 @@ void Configure::generateQConfigCpp()
|
||||
<< " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
|
||||
<< " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
|
||||
<< " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
|
||||
+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
|
||||
<< " \"qt_targspec=" << targSpec << "\"," << endl
|
||||
<< " \"qt_hostspec=" << hostSpec << "\"," << endl
|
||||
<< "#endif" << endl
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
From 21c573762a168f874f32c8bf49f75442e608e08a Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Wed, 17 Apr 2013 18:06:25 +0200
|
||||
Subject: [PATCH 04/22] qt_functions: temporary remove isEmpty check
|
||||
|
||||
* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
|
||||
* isEmpty works correctly only with qmake variables (e.g. $$FOO -
|
||||
isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/qt_functions.prf | 6 +++++-
|
||||
mkspecs/features/qt_tool.prf | 3 +--
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
|
||||
index 4e12d3d..e20ad9d 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
|
||||
$$1 = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty($$1) {
|
||||
$$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
|
||||
- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+ # for some reason isEmpty does not work here, FIXME before submitting upstream
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
|
||||
+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
|
||||
$$1 = $$[QT_HOST_BINS]/$$2
|
||||
}
|
||||
exists($$eval($$1).pl) {
|
||||
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
|
||||
index 83ef3a0..21c9eb7 100644
|
||||
--- a/mkspecs/features/qt_tool.prf
|
||||
+++ b/mkspecs/features/qt_tool.prf
|
||||
@@ -15,8 +15,7 @@ CONFIG += console
|
||||
|
||||
# If we are doing a prefix build, create a "module" pri which enables
|
||||
# qtPrepareTool() to work with the non-installed build.
|
||||
-# Non-bootstrapped tools always need this because of the environment setup.
|
||||
-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
isEmpty(MODULE):MODULE = $$TARGET
|
||||
|
||||
!host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From c2cc1f9251953f680191c5cf53b019d5d480c79e Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 27 Apr 2013 22:33:33 +0200
|
||||
Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with
|
||||
SYSROOT
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
tools/configure/configureapp.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
|
||||
index aed85ce..0575520 100644
|
||||
--- a/tools/configure/configureapp.cpp
|
||||
+++ b/tools/configure/configureapp.cpp
|
||||
@@ -3111,8 +3111,8 @@ void Configure::generateQConfigPri()
|
||||
configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
|
||||
if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
|
||||
// FIXME: add detection
|
||||
- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
|
||||
- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
|
||||
+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
|
||||
+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
|
||||
}
|
||||
if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
|
||||
configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From 0089c1ecba912aed6a8cd6126297300e0f7ffcb9 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 08/22] qt_module: Fix pkgconfig replacement
|
||||
|
||||
* in situation like this:
|
||||
QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
|
||||
QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
|
||||
QT_INSTALL_LIBS/raw:/usr/lib
|
||||
QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
|
||||
|
||||
I don't want the replacement like this:
|
||||
sed
|
||||
-e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
|
||||
-e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
|
||||
"../../lib/pkgconfig/Qt5Core.pc"
|
||||
>"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
|
||||
because that way I'll end with -L/usr/lib in .pc file which is
|
||||
cross-compile unfriendly, keeping ${libdir}/${includedir} works better
|
||||
in my case
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
|
||||
1 file changed, 16 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index 390fb49..e85c2a8 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -140,18 +140,30 @@ unix|win32-g++* {
|
||||
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
||||
else: \
|
||||
rplbase = $$MODULE_BASE_OUTDIR
|
||||
+ pkgconfig_include_replace.match = $$rplbase/include
|
||||
+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
|
||||
+ pkgconfig_lib_replace.match = $$rplbase/lib
|
||||
+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
|
||||
include_replace.match = $$rplbase/include
|
||||
include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
lib_replace.match = $$rplbase/lib
|
||||
- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
|
||||
- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
|
||||
+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
+
|
||||
+ !isEmpty(SYSROOT): \
|
||||
+ rplbase = $$[SYSROOT] \
|
||||
+ lafile_replace.match = $$rplbase \
|
||||
+ lafile_replace.replace = "=" \
|
||||
+
|
||||
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
|
||||
QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
|
||||
}
|
||||
|
||||
unix {
|
||||
CONFIG += create_libtool explicitlib
|
||||
- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
|
||||
- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
|
||||
+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
|
||||
+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
|
||||
}
|
||||
|
||||
unix|win32-g++* {
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
From d4f6f5afa36d87d991051f0079f129d2682455d9 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 28 Apr 2013 12:56:55 +0200
|
||||
Subject: [PATCH 09/22] qt_module: Fix paths in .prl files
|
||||
|
||||
* qmake does not prefix them with QT_SYSROOT when using them
|
||||
so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
|
||||
variable, which is unsafe for cross-compilation
|
||||
* writting QT_SYSROOT in .prl files is dangerous for sstate when
|
||||
builds are in different directories, so we need
|
||||
SSTATE_SCAN_FILES += "*.pri *.prl"
|
||||
to make them relocateble
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
|
||||
1 file changed, 17 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index e85c2a8..7fcfcfe 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -144,17 +144,23 @@ unix|win32-g++* {
|
||||
pkgconfig_include_replace.replace = "\$$\\{includedir}"
|
||||
pkgconfig_lib_replace.match = $$rplbase/lib
|
||||
pkgconfig_lib_replace.replace = "\$$\\{libdir}"
|
||||
- include_replace.match = $$rplbase/include
|
||||
- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
- lib_replace.match = $$rplbase/lib
|
||||
- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
- lafile_replace.match = $$rplbase
|
||||
- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
-
|
||||
- !isEmpty(SYSROOT): \
|
||||
- rplbase = $$[SYSROOT] \
|
||||
- lafile_replace.match = $$rplbase \
|
||||
- lafile_replace.replace = "=" \
|
||||
+ !exists($$[QT_SYSROOT]) {
|
||||
+ include_replace.match = $$rplbase/include
|
||||
+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
+ lib_replace.match = $$rplbase/lib
|
||||
+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
|
||||
+ } else {
|
||||
+ # include_replace and lib_replace are duplicate, but we don't want to
|
||||
+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
|
||||
+ include_replace.match = $$rplbase
|
||||
+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
|
||||
+ lib_replace.match = $$rplbase
|
||||
+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
+ }
|
||||
|
||||
QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
|
||||
QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
From 9a2219a25247b76de6524d358211b55467305d11 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 5 May 2013 11:18:34 +0200
|
||||
Subject: [PATCH 10/22] wayland-scanner: disable silent rules
|
||||
|
||||
* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/wayland-scanner.prf | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
|
||||
index b2eca41..46da374 100644
|
||||
--- a/mkspecs/features/wayland-scanner.prf
|
||||
+++ b/mkspecs/features/wayland-scanner.prf
|
||||
@@ -10,7 +10,7 @@ wayland_server_header.input = WAYLANDSERVERSOURCES
|
||||
wayland_server_header.variable_out = HEADERS
|
||||
wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
|
||||
wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
|
||||
+#silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
|
||||
QMAKE_EXTRA_COMPILERS += wayland_server_header
|
||||
|
||||
wayland_client_header.name = wayland ${QMAKE_FILE_BASE}
|
||||
@@ -18,7 +18,7 @@ wayland_client_header.input = WAYLANDCLIENTSOURCES
|
||||
wayland_client_header.variable_out = HEADERS
|
||||
wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
|
||||
wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
|
||||
+#silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
|
||||
QMAKE_EXTRA_COMPILERS += wayland_client_header
|
||||
|
||||
wayland_code.name = wayland ${QMAKE_FILE_BASE}
|
||||
@@ -26,7 +26,7 @@ wayland_code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
|
||||
wayland_code.variable_out = SOURCES
|
||||
wayland_code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
|
||||
wayland_code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands
|
||||
+#silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands
|
||||
QMAKE_EXTRA_COMPILERS += wayland_code
|
||||
|
||||
qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
|
||||
@@ -37,7 +37,7 @@ qtwayland_client_header.variable_out = HEADERS
|
||||
qtwayland_client_header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
|
||||
qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
|
||||
+#silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland_client_header
|
||||
|
||||
qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE}
|
||||
@@ -46,7 +46,7 @@ qtwayland_client_code.variable_out = SOURCES
|
||||
qtwayland_client_code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp
|
||||
qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
|
||||
+#silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland_client_code
|
||||
|
||||
qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE}
|
||||
@@ -55,7 +55,7 @@ qtwayland_server_header.variable_out = HEADERS
|
||||
qtwayland_server_header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
|
||||
qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
|
||||
+#silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland_server_header
|
||||
|
||||
qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE}
|
||||
@@ -64,5 +64,5 @@ qtwayland_server_code.variable_out = SOURCES
|
||||
qtwayland_server_code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
|
||||
qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
|
||||
+#silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland_server_code
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
From 05fc8b21f40d2e6bc35fa717ea340ef26f922d32 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Wed, 8 May 2013 23:54:35 +0200
|
||||
Subject: [PATCH 11/22] configure: don't export SYSTEM_VARIABLES to .qmake.vars
|
||||
|
||||
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
|
||||
causing issues as we need g++ to be used as linker
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 15 +--------------
|
||||
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 40f2b02..11c11c4 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -849,20 +849,7 @@ fi'`
|
||||
done
|
||||
|
||||
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||
-for varname in $SYSTEM_VARIABLES; do
|
||||
- qmakevarname="${varname}"
|
||||
- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
|
||||
- if [ "${varname}" = "LDFLAGS" ]; then
|
||||
- qmakevarname="LFLAGS"
|
||||
- elif [ "${varname}" = "LD" ]; then
|
||||
- qmakevarname="LINK"
|
||||
- fi
|
||||
- cmd=`echo \
|
||||
-'if [ -n "\$'${varname}'" ]; then
|
||||
- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
|
||||
-fi'`
|
||||
- eval "$cmd"
|
||||
-done
|
||||
+
|
||||
# Use CC/CXX to run config.tests
|
||||
mkdir -p "$outpath/config.tests"
|
||||
rm -f "$outpath/config.tests/.qmake.cache"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From 70669010c6f8a541db6f87f96aee3ff50ec8483f Mon Sep 17 00:00:00 2001
|
||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Date: Tue, 8 Jan 2013 15:58:29 -0800
|
||||
Subject: [PATCH 13/22] Disable mkv8snapshot
|
||||
|
||||
It seems to generate code that throws SIGILL, so disabling it
|
||||
|
||||
Program received signal SIGILL, Illegal instruction.
|
||||
0x26312c60 in ?? ()
|
||||
(gdb) bt
|
||||
function=..., receiver=..., argc=1978934572, args=0x7efff254,
|
||||
has_pending_exception=0x7efff277, qml=...)
|
||||
at ../3rdparty/v8/src/execution.cc:125
|
||||
argc=1, argv=0x7efff254, pending_exception=0x7efff277,
|
||||
convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
|
||||
receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
|
||||
pending_exception=0x7efff277, convert_receiver=false)
|
||||
at ../3rdparty/v8/src/execution.cc:161
|
||||
data=<optimized out>, exc=0x7efff277)
|
||||
at ../3rdparty/v8/src/execution.cc:734
|
||||
at ../3rdparty/v8/src/api.cc:4742
|
||||
at qml/v8/qv8contextwrapper.cpp:155
|
||||
ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
|
||||
parent=<optimized out>) at qml/v8/qjsengine.cpp:192
|
||||
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 11c11c4..521e374 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -910,7 +910,7 @@ CFG_SKIP_MODULES=""
|
||||
CFG_COMPILE_EXAMPLES=yes
|
||||
CFG_RELEASE_QMAKE=no
|
||||
CFG_AUDIO_BACKEND=auto
|
||||
-CFG_V8SNAPSHOT=auto
|
||||
+CFG_V8SNAPSHOT=no
|
||||
CFG_QML_DEBUG=yes
|
||||
CFG_JAVASCRIPTCORE_JIT=auto
|
||||
CFG_PKGCONFIG=auto
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 3642ea2f7eff14c0835385f28a13514b806eba32 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||
Date: Mon, 27 May 2013 18:32:37 +0200
|
||||
Subject: [PATCH 14/22] enables tslib device to be read from env variable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
from :
|
||||
https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
|
||||
|
||||
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/plugins/generic/tslib/qtslib.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
|
||||
index 6986fd5..2ed4a69 100644
|
||||
--- a/src/plugins/generic/tslib/qtslib.cpp
|
||||
+++ b/src/plugins/generic/tslib/qtslib.cpp
|
||||
@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
|
||||
qDebug() << "QTsLibMouseHandler" << key << specification;
|
||||
setObjectName(QLatin1String("TSLib Mouse Handler"));
|
||||
|
||||
- QByteArray device = "/dev/input/event1";
|
||||
+ QByteArray device = qgetenv("TSLIB_TSDEVICE");
|
||||
+ if(device.isEmpty())
|
||||
+ device = "/dev/input/event1";
|
||||
if (specification.startsWith("/dev/"))
|
||||
device = specification.toLocal8Bit();
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From 52172f09d646949c32f7b70188f1ffc779adbdef Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||
Date: Sat, 25 May 2013 17:34:32 +0200
|
||||
Subject: [PATCH 15/22] qtbase: allow build of examples
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
this revert the following commit :
|
||||
|
||||
commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
|
||||
Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
||||
Date: Fri Dec 21 19:36:12 2012 +0100
|
||||
|
||||
do not actually build examples in production builds
|
||||
|
||||
-developer-build enables an actual build of examples, based on the
|
||||
assumption that developers want to test it (it can be still disabled
|
||||
with -nomake examples). regular users otoh want only the examples
|
||||
sources installed.
|
||||
|
||||
Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
|
||||
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
||||
|
||||
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
||||
---
|
||||
mkspecs/features/qt_example_installs.prf | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
|
||||
index 2db752c..ca1b0c7 100644
|
||||
--- a/mkspecs/features/qt_example_installs.prf
|
||||
+++ b/mkspecs/features/qt_example_installs.prf
|
||||
@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
|
||||
allfiles -= doc
|
||||
!isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
|
||||
}
|
||||
-
|
||||
- !equals(TEMPLATE, subdirs):!compile_examples {
|
||||
- TEMPLATE = aux
|
||||
- CONFIG -= have_target qt staticlib dll
|
||||
- SOURCES =
|
||||
- INSTALLS -= target
|
||||
- }
|
||||
}
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,154 +0,0 @@
|
|||
From cc2bdb0bbbbeb4eb630d82b7274d13922eb06da2 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 16/22] QOpenGLPaintDevice sub-area support
|
||||
|
||||
Allows creating QOpenGLPaintDevice targetting sub-area
|
||||
of binded framebuffer.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++
|
||||
src/gui/opengl/qopenglpaintdevice.h | 2 ++
|
||||
src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++---
|
||||
src/gui/opengl/qopenglpaintengine_p.h | 1 +
|
||||
src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
|
||||
5 files changed, 23 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
|
||||
index f0e7e49..fe9a30c 100644
|
||||
--- a/src/gui/opengl/qopenglpaintdevice.cpp
|
||||
+++ b/src/gui/opengl/qopenglpaintdevice.cpp
|
||||
@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
|
||||
public:
|
||||
QOpenGLPaintDevicePrivate(const QSize &size);
|
||||
|
||||
+ QPoint offset;
|
||||
QSize size;
|
||||
QOpenGLContext *ctx;
|
||||
|
||||
@@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
|
||||
{
|
||||
}
|
||||
|
||||
+QOpenGLPaintDevice::QOpenGLPaintDevice(int x, int y, int width, int height)
|
||||
+ : d_ptr(new QOpenGLPaintDevicePrivate(QSize(width, height)))
|
||||
+{
|
||||
+ d_ptr->offset = QPoint(x,y);
|
||||
+}
|
||||
+
|
||||
/*!
|
||||
Destroys the QOpenGLPaintDevice.
|
||||
*/
|
||||
@@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const
|
||||
return d_ptr->ctx;
|
||||
}
|
||||
|
||||
+QPoint QOpenGLPaintDevice::offset() const
|
||||
+{
|
||||
+ return d_ptr->offset;
|
||||
+}
|
||||
+
|
||||
/*!
|
||||
Returns the pixel size of the paint device.
|
||||
|
||||
diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
|
||||
index c05571c..01eb1bc 100644
|
||||
--- a/src/gui/opengl/qopenglpaintdevice.h
|
||||
+++ b/src/gui/opengl/qopenglpaintdevice.h
|
||||
@@ -62,12 +62,14 @@ public:
|
||||
QOpenGLPaintDevice();
|
||||
explicit QOpenGLPaintDevice(const QSize &size);
|
||||
QOpenGLPaintDevice(int width, int height);
|
||||
+ QOpenGLPaintDevice(int x, int y, int width, int height);
|
||||
virtual ~QOpenGLPaintDevice();
|
||||
|
||||
int devType() const { return QInternal::OpenGL; }
|
||||
QPaintEngine *paintEngine() const;
|
||||
|
||||
QOpenGLContext *context() const;
|
||||
+ QPoint offset() const;
|
||||
QSize size() const;
|
||||
void setSize(const QSize &size);
|
||||
void setDevicePixelRatio(qreal devicePixelRatio);
|
||||
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
|
||||
index 78f5080..20db620 100644
|
||||
--- a/src/gui/opengl/qopenglpaintengine.cpp
|
||||
+++ b/src/gui/opengl/qopenglpaintengine.cpp
|
||||
@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
|
||||
for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
|
||||
d->vertexAttributeArraysEnabledState[i] = false;
|
||||
|
||||
+ const QPoint offset = d->device->offset();
|
||||
const QSize sz = d->device->size();
|
||||
+ d->x = offset.x();
|
||||
+ d->y = offset.y();
|
||||
d->width = sz.width();
|
||||
d->height = sz.height();
|
||||
d->mode = BrushDrawingMode;
|
||||
@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
|
||||
d->device->ensureActiveTarget();
|
||||
|
||||
d->transferMode(BrushDrawingMode);
|
||||
- glViewport(0, 0, d->width, d->height);
|
||||
+ glViewport(d->x, d->y, d->width, d->height);
|
||||
d->needsSync = false;
|
||||
d->lastMaskTextureUsed = 0;
|
||||
d->shaderManager->setDirty();
|
||||
@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
|
||||
if (bounds == QRect(0, 0, width, height)) {
|
||||
glDisable(GL_SCISSOR_TEST);
|
||||
} else {
|
||||
+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
|
||||
glEnable(GL_SCISSOR_TEST);
|
||||
setScissor(bounds);
|
||||
}
|
||||
@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
|
||||
|
||||
void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
|
||||
{
|
||||
- const int left = rect.left();
|
||||
+ const int left = rect.left() + x;
|
||||
const int width = rect.width();
|
||||
int bottom = height - (rect.top() + rect.height());
|
||||
if (device->paintFlipped()) {
|
||||
bottom = rect.top();
|
||||
}
|
||||
+ bottom += y;
|
||||
const int height = rect.height();
|
||||
-
|
||||
glScissor(left, bottom, width, height);
|
||||
}
|
||||
|
||||
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
|
||||
index d51f0e5..0d4b38d 100644
|
||||
--- a/src/gui/opengl/qopenglpaintengine_p.h
|
||||
+++ b/src/gui/opengl/qopenglpaintengine_p.h
|
||||
@@ -264,6 +264,7 @@ public:
|
||||
QOpenGL2PaintEngineEx* q;
|
||||
QOpenGLEngineShaderManager* shaderManager;
|
||||
QOpenGLPaintDevice* device;
|
||||
+ int x, y;
|
||||
int width, height;
|
||||
QOpenGLContext *ctx;
|
||||
EngineMode mode;
|
||||
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
|
||||
index 7d49c03..d9eb3fe 100644
|
||||
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
|
||||
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
|
||||
@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
|
||||
funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
|
||||
|
||||
if (pex != 0) {
|
||||
- glViewport(0, 0, pex->width, pex->height);
|
||||
+ glViewport(pex->x, pex->y, pex->width, pex->height);
|
||||
pex->updateClipScissorTest();
|
||||
} else {
|
||||
m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From 5aaec8299901e0093cec2b704a724bc3254b8b8d Mon Sep 17 00:00:00 2001
|
||||
From: Jani Hautakangas <jani.hautakangas@ixonos.com>
|
||||
Date: Mon, 27 May 2013 15:25:25 -0700
|
||||
Subject: [PATCH 17/22] Use BGRA extension in bindTexture
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/gui/opengl/qopengltexturecache.cpp | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
|
||||
index 94b8288..5c8aa3c 100644
|
||||
--- a/src/gui/opengl/qopengltexturecache.cpp
|
||||
+++ b/src/gui/opengl/qopengltexturecache.cpp
|
||||
@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
|
||||
|
||||
QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
|
||||
|
||||
- // Performance could be improved by skipping qgl_byteSwapImage().
|
||||
- if (m_useByteSwapImage)
|
||||
- qgl_byteSwapImage(tx);
|
||||
-
|
||||
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
|
||||
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
|
||||
|
||||
int cost = tx.width() * tx.height() * 4 / 1024;
|
||||
m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From 0bc48cdb5e3556a96320ea963d2e031b0810d0d4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 28 Feb 2012 15:10:24 +0000
|
||||
Subject: [PATCH 18/22] configure: make pulseaudio a configurable option
|
||||
|
||||
Allows disabling pulseaudio support at configure time.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 521e374..896e012 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ pulseaudio)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
+ CFG_PULSEAUDIO="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From e6430c64e4dcc48ae59e48fa303bbea33b253011 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Fri, 19 Jul 2013 23:21:28 +0200
|
||||
Subject: [PATCH 19/22] configure: make alsa a configurable option
|
||||
|
||||
Allows disabling alsa support at configure time.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 896e012..3470b32 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ alsa)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
+ CFG_ALSA="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 98201094967e2e4224c394d0c92c0be7d39582a6 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 20 Jul 2013 10:56:37 +0200
|
||||
Subject: [PATCH 20/22] configure: make freetype a configurable option
|
||||
|
||||
Allows disabling freetype support at configure time.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 3470b32..b0ec977 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ freetype)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
|
||||
+ CFG_LIBFREETYPE="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shaw <andy.shaw@digia.com>
|
||||
Date: Tue, 8 Oct 2013 15:45:42 +0200
|
||||
Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
|
||||
|
||||
Task-number: QTBUG-31579
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/painting/qcosmeticstroker.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
|
||||
index 39f6422..a2301e3 100644
|
||||
--- a/src/gui/painting/qcosmeticstroker.cpp
|
||||
+++ b/src/gui/painting/qcosmeticstroker.cpp
|
||||
@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
|
||||
ymax = deviceRect.bottom() + 2;
|
||||
|
||||
lastPixel.x = -1;
|
||||
+ lastPixel.y = -1;
|
||||
}
|
||||
|
||||
// returns true if the whole line gets clipped away
|
||||
@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
|
||||
QPointF p = QPointF(points[0], points[1]) * state->matrix;
|
||||
patternOffset = state->lastPen.dashOffset()*64;
|
||||
lastPixel.x = -1;
|
||||
+ lastPixel.y = -1;
|
||||
|
||||
bool closed;
|
||||
const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
|
||||
@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
|
||||
QPointF movedTo = p;
|
||||
patternOffset = state->lastPen.dashOffset()*64;
|
||||
lastPixel.x = -1;
|
||||
+ lastPixel.y = -1;
|
||||
|
||||
const qreal *begin = points;
|
||||
const qreal *end = points + 2*path.elementCount();
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
Date: Wed, 23 Oct 2013 00:28:17 +1100
|
||||
Subject: [PATCH] Fix misaligned selection region with text when centered
|
||||
|
||||
If the text is centered, the x/y position in the selection QRectF may
|
||||
be a multiple of 0.5 which is rounded up. This rounding causes
|
||||
misalignment of the selection region with the text.
|
||||
|
||||
The alignment is fixed by using qFloor on the x and y components.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-34218
|
||||
Task-number: QTBUG-34234
|
||||
Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
|
||||
1 file changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
||||
index 54d337e..66341e1 100644
|
||||
--- a/src/gui/text/qtextlayout.cpp
|
||||
+++ b/src/gui/text/qtextlayout.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
|
||||
#include <qthread.h>
|
||||
#include <qfont.h>
|
||||
+#include <qmath.h>
|
||||
#include <qpainter.h>
|
||||
#include <qvarlengtharray.h>
|
||||
#include <qtextformat.h>
|
||||
@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
|
||||
continue;
|
||||
}
|
||||
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ if (lastSelectionWidth > 0) {
|
||||
+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
||||
+ rect.moveLeft(qFloor(rect.left()));
|
||||
+ rect.moveTop(qFloor(rect.top()));
|
||||
+ region->addRect(rect);
|
||||
+ }
|
||||
|
||||
lastSelectionX = selectionX;
|
||||
lastSelectionWidth = selectionWidth;
|
||||
}
|
||||
}
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ if (lastSelectionWidth > 0) {
|
||||
+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
||||
+ rect.moveLeft(qFloor(rect.left()));
|
||||
+ rect.moveTop(qFloor(rect.top()));
|
||||
+ region->addRect(rect);
|
||||
+ }
|
||||
}
|
||||
|
||||
static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
|
||||
@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
|
||||
|
||||
QBrush bg = chf.background();
|
||||
if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
|
||||
- p->fillRect(r, bg);
|
||||
+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
|
||||
if (c.style() != Qt::NoBrush) {
|
||||
p->setPen(QPen(c, 0));
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001
|
||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Date: Tue, 27 Nov 2012 12:46:44 -0800
|
||||
Subject: [PATCH] Always build uic
|
||||
|
||||
Even if we are not building gui or widgets. This tool is needed later
|
||||
as a native tool when compiling the target.
|
||||
|
||||
Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/src.pro | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index b4c9602..f30ec1f 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
|
||||
contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
|
||||
src_plugins.depends += src_gui src_platformsupport
|
||||
!contains(QT_CONFIG, no-widgets) {
|
||||
- SUBDIRS += src_tools_uic src_widgets
|
||||
+ SUBDIRS += src_widgets
|
||||
src_plugins.depends += src_widgets
|
||||
contains(QT_CONFIG, opengl(es1|es2)?) {
|
||||
SUBDIRS += src_opengl
|
||||
@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
|
||||
}
|
||||
}
|
||||
}
|
||||
-SUBDIRS += src_plugins src_tools_qdoc
|
||||
+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
|
||||
|
||||
nacl: SUBDIRS -= src_network src_testlib
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Wed, 17 Apr 2013 18:06:25 +0200
|
||||
Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check
|
||||
|
||||
* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
|
||||
* isEmpty works correctly only with qmake variables (e.g. $$FOO -
|
||||
isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/qt_functions.prf | 6 +++++-
|
||||
mkspecs/features/qt_tool.prf | 3 +--
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
|
||||
index 4e12d3d..e20ad9d 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
|
||||
$$1 = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty($$1) {
|
||||
$$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
|
||||
- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+ # for some reason isEmpty does not work here, FIXME before submitting upstream
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
|
||||
+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
|
||||
$$1 = $$[QT_HOST_BINS]/$$2
|
||||
}
|
||||
exists($$eval($$1).pl) {
|
||||
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
|
||||
index 83ef3a0..21c9eb7 100644
|
||||
--- a/mkspecs/features/qt_tool.prf
|
||||
+++ b/mkspecs/features/qt_tool.prf
|
||||
@@ -15,8 +15,7 @@ CONFIG += console
|
||||
|
||||
# If we are doing a prefix build, create a "module" pri which enables
|
||||
# qtPrepareTool() to work with the non-installed build.
|
||||
-# Non-bootstrapped tools always need this because of the environment setup.
|
||||
-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
isEmpty(MODULE):MODULE = $$TARGET
|
||||
|
||||
!host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Krelin <hacker@klever.net>
|
||||
Date: Mon, 29 Oct 2012 20:07:49 -0700
|
||||
Subject: [PATCH 05/23] qmake is already built in qtbase-native
|
||||
|
||||
Ported from OE by: Yu Ke <ke.yu@intel.com>
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 25980c0..74f9e65 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4022,7 +4022,7 @@ setBootstrapEvalVariable()
|
||||
|
||||
|
||||
# build qmake
|
||||
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
echo "Creating qmake..."
|
||||
|
||||
mkdir -p "$outpath/qmake" || exit
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 6007028a92806a0fd0683f539dba178ad33ab87d Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Mon, 29 Oct 2012 20:26:36 -0700
|
||||
Subject: [PATCH 06/23] Allow building a separate qmake for the target
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
qmake/qmake.pro | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
|
||||
index a81d0cd..ed7aebf 100644
|
||||
--- a/qmake/qmake.pro
|
||||
+++ b/qmake/qmake.pro
|
||||
@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic
|
||||
DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
|
||||
PROEVALUATOR_FULL PROEVALUATOR_DEBUG
|
||||
DESTDIR = ../bin/
|
||||
+TARGET = qmake
|
||||
|
||||
OBJECTS_DIR = .
|
||||
MOC_DIR = .
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From bd192d0261e39765d895446e9d914a68a0590365 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 27 Apr 2013 22:33:33 +0200
|
||||
Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with
|
||||
SYSROOT
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
tools/configure/configureapp.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
|
||||
index c752df3..0d1bca6 100644
|
||||
--- a/tools/configure/configureapp.cpp
|
||||
+++ b/tools/configure/configureapp.cpp
|
||||
@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri()
|
||||
configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
|
||||
if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
|
||||
// FIXME: add detection
|
||||
- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
|
||||
- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
|
||||
+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
|
||||
+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
|
||||
}
|
||||
if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
|
||||
configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
From 5168edad24f2c27061286707603bc2126365bcb2 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 08/23] qt_module: Fix pkgconfig replacement
|
||||
|
||||
* in situation like this:
|
||||
QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
|
||||
QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
|
||||
QT_INSTALL_LIBS/raw:/usr/lib
|
||||
QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
|
||||
|
||||
I don't want the replacement like this:
|
||||
sed
|
||||
-e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
|
||||
-e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
|
||||
"../../lib/pkgconfig/Qt5Core.pc"
|
||||
>"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
|
||||
because that way I'll end with -L/usr/lib in .pc file which is
|
||||
cross-compile unfriendly, keeping ${libdir}/${includedir} works better
|
||||
in my case
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
|
||||
1 file changed, 16 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index 7f7de85..7741b96 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -140,18 +140,30 @@ unix|win32-g++* {
|
||||
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
||||
else: \
|
||||
rplbase = $$MODULE_BASE_OUTDIR
|
||||
+ pkgconfig_include_replace.match = $$rplbase/include
|
||||
+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
|
||||
+ pkgconfig_lib_replace.match = $$rplbase/lib
|
||||
+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
|
||||
include_replace.match = $$rplbase/include
|
||||
include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
lib_replace.match = $$rplbase/lib
|
||||
- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
|
||||
- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
|
||||
+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
+
|
||||
+ !isEmpty(SYSROOT): \
|
||||
+ rplbase = $$[SYSROOT] \
|
||||
+ lafile_replace.match = $$rplbase \
|
||||
+ lafile_replace.replace = "=" \
|
||||
+
|
||||
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
|
||||
QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
|
||||
}
|
||||
|
||||
unix {
|
||||
CONFIG += create_libtool explicitlib
|
||||
- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
|
||||
- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
|
||||
+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
|
||||
+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
|
||||
}
|
||||
|
||||
unix|win32-g++* {
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
From fdd0a04cca9cb991b7073d01312218d3387c1e43 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 28 Apr 2013 12:56:55 +0200
|
||||
Subject: [PATCH 09/23] qt_module: Fix paths in .prl files
|
||||
|
||||
* qmake does not prefix them with QT_SYSROOT when using them
|
||||
so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
|
||||
variable, which is unsafe for cross-compilation
|
||||
* writting QT_SYSROOT in .prl files is dangerous for sstate when
|
||||
builds are in different directories, so we need
|
||||
SSTATE_SCAN_FILES += "*.pri *.prl"
|
||||
to make them relocateble
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
|
||||
1 file changed, 17 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index 7741b96..3874067 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -144,17 +144,23 @@ unix|win32-g++* {
|
||||
pkgconfig_include_replace.replace = "\$$\\{includedir}"
|
||||
pkgconfig_lib_replace.match = $$rplbase/lib
|
||||
pkgconfig_lib_replace.replace = "\$$\\{libdir}"
|
||||
- include_replace.match = $$rplbase/include
|
||||
- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
- lib_replace.match = $$rplbase/lib
|
||||
- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
- lafile_replace.match = $$rplbase
|
||||
- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
-
|
||||
- !isEmpty(SYSROOT): \
|
||||
- rplbase = $$[SYSROOT] \
|
||||
- lafile_replace.match = $$rplbase \
|
||||
- lafile_replace.replace = "=" \
|
||||
+ !exists($$[QT_SYSROOT]) {
|
||||
+ include_replace.match = $$rplbase/include
|
||||
+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
+ lib_replace.match = $$rplbase/lib
|
||||
+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
|
||||
+ } else {
|
||||
+ # include_replace and lib_replace are duplicate, but we don't want to
|
||||
+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
|
||||
+ include_replace.match = $$rplbase
|
||||
+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
|
||||
+ lib_replace.match = $$rplbase
|
||||
+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
+ }
|
||||
|
||||
QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
|
||||
QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 5 May 2013 11:18:34 +0200
|
||||
Subject: [PATCH 10/23] wayland-scanner: disable silent rules
|
||||
|
||||
* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/wayland-scanner.prf | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
|
||||
index 2ec064f..847d0f7 100644
|
||||
--- a/mkspecs/features/wayland-scanner.prf
|
||||
+++ b/mkspecs/features/wayland-scanner.prf
|
||||
@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES
|
||||
wayland-server-header.variable_out = HEADERS
|
||||
wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
|
||||
wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
|
||||
+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
|
||||
QMAKE_EXTRA_COMPILERS += wayland-server-header
|
||||
|
||||
wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
|
||||
@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES
|
||||
wayland-client-header.variable_out = HEADERS
|
||||
wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
|
||||
wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
|
||||
+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
|
||||
QMAKE_EXTRA_COMPILERS += wayland-client-header
|
||||
|
||||
wayland-code.name = wayland ${QMAKE_FILE_BASE}
|
||||
@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
|
||||
wayland-code.variable_out = SOURCES
|
||||
wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
|
||||
wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
|
||||
+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
|
||||
QMAKE_EXTRA_COMPILERS += wayland-code
|
||||
|
||||
qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
|
||||
@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS
|
||||
qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
|
||||
qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
|
||||
+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland-client-header
|
||||
|
||||
qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE}
|
||||
@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES
|
||||
qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp
|
||||
qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
|
||||
+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland-client-code
|
||||
|
||||
qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE}
|
||||
@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS
|
||||
qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
|
||||
qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
|
||||
+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland-server-header
|
||||
|
||||
qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE}
|
||||
@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES
|
||||
qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
|
||||
qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
|
||||
qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
|
||||
-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
|
||||
+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
|
||||
QMAKE_EXTRA_COMPILERS += qtwayland-server-code
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From e72d6d0528bb0032dddfbdb01a232f62e5931ba8 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Thu, 9 May 2013 10:06:50 +0200
|
||||
Subject: [PATCH 12/23] configure.prf: Allow to add extra arguments to make
|
||||
|
||||
* sometimes we would like to add -e or define some variable and respect it from both
|
||||
Makefiles used in configure tests and also Makefiles to build the application
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
mkspecs/features/configure.prf | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
|
||||
index b4569df..d189e50 100644
|
||||
--- a/mkspecs/features/configure.prf
|
||||
+++ b/mkspecs/features/configure.prf
|
||||
@@ -57,12 +57,12 @@ defineTest(qtCompileTest) {
|
||||
qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
|
||||
|
||||
# Clean up after previous run
|
||||
- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
|
||||
+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
|
||||
|
||||
mkpath($$test_out_dir)|error("Aborting.")
|
||||
|
||||
qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
|
||||
- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
|
||||
+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
|
||||
log("yes$$escape_expand(\\n)")
|
||||
msg = "test $$1 succeeded"
|
||||
write_file($$QMAKE_CONFIG_LOG, msg, append)
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From 4d9e581943ed3a7440e8176ab81c82fe949ae300 Mon Sep 17 00:00:00 2001
|
||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Date: Tue, 8 Jan 2013 15:58:29 -0800
|
||||
Subject: [PATCH 13/23] Disable mkv8snapshot
|
||||
|
||||
It seems to generate code that throws SIGILL, so disabling it
|
||||
|
||||
Program received signal SIGILL, Illegal instruction.
|
||||
0x26312c60 in ?? ()
|
||||
(gdb) bt
|
||||
function=..., receiver=..., argc=1978934572, args=0x7efff254,
|
||||
has_pending_exception=0x7efff277, qml=...)
|
||||
at ../3rdparty/v8/src/execution.cc:125
|
||||
argc=1, argv=0x7efff254, pending_exception=0x7efff277,
|
||||
convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
|
||||
receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
|
||||
pending_exception=0x7efff277, convert_receiver=false)
|
||||
at ../3rdparty/v8/src/execution.cc:161
|
||||
data=<optimized out>, exc=0x7efff277)
|
||||
at ../3rdparty/v8/src/execution.cc:734
|
||||
at ../3rdparty/v8/src/api.cc:4742
|
||||
at qml/v8/qv8contextwrapper.cpp:155
|
||||
ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
|
||||
parent=<optimized out>) at qml/v8/qjsengine.cpp:192
|
||||
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 7a9a77c..69e30b5 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -910,7 +910,7 @@ CFG_SKIP_MODULES=""
|
||||
CFG_COMPILE_EXAMPLES=auto
|
||||
CFG_RELEASE_QMAKE=no
|
||||
CFG_AUDIO_BACKEND=auto
|
||||
-CFG_V8SNAPSHOT=auto
|
||||
+CFG_V8SNAPSHOT=no
|
||||
CFG_QML_DEBUG=yes
|
||||
CFG_JAVASCRIPTCORE_JIT=auto
|
||||
CFG_PKGCONFIG=auto
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From 893bf856c5f61c75cd9a2c44dff911f31db261e1 Mon Sep 17 00:00:00 2001
|
||||
From: Jani Hautakangas <jani.hautakangas@ixonos.com>
|
||||
Date: Mon, 27 May 2013 15:25:25 -0700
|
||||
Subject: [PATCH 20/23] Use BGRA extension in bindTexture
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/gui/opengl/qopengltexturecache.cpp | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
|
||||
index 94b8288..5c8aa3c 100644
|
||||
--- a/src/gui/opengl/qopengltexturecache.cpp
|
||||
+++ b/src/gui/opengl/qopengltexturecache.cpp
|
||||
@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
|
||||
|
||||
QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
|
||||
|
||||
- // Performance could be improved by skipping qgl_byteSwapImage().
|
||||
- if (m_useByteSwapImage)
|
||||
- qgl_byteSwapImage(tx);
|
||||
-
|
||||
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
|
||||
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
|
||||
|
||||
int cost = tx.width() * tx.height() * 4 / 1024;
|
||||
m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From f6156776d191b9d848d6892c473dfa2cd8963884 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 28 Feb 2012 15:10:24 +0000
|
||||
Subject: [PATCH 21/23] configure: make pulseaudio a configurable option
|
||||
|
||||
Allows disabling pulseaudio support at configure time.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 69e30b5..290b9ac 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ pulseaudio)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
+ CFG_PULSEAUDIO="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 39dc112aa81a9e658fa00e1fc88ed3f712b4687a Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Fri, 19 Jul 2013 23:21:28 +0200
|
||||
Subject: [PATCH 22/23] configure: make alsa a configurable option
|
||||
|
||||
Allows disabling alsa support at configure time.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 290b9ac..5e9bfd4 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ alsa)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
+ CFG_ALSA="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 059904ca921dfbdc9d702be67dcce66957ef6ecd Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 20 Jul 2013 10:56:37 +0200
|
||||
Subject: [PATCH 23/23] configure: make freetype a configurable option
|
||||
|
||||
Allows disabling freetype support at configure time.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 5e9bfd4..5b1f5f2 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ freetype)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
|
||||
+ CFG_LIBFREETYPE="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001
|
||||
From: Simon Busch <morphis@gravedo.de>
|
||||
Date: Mon, 22 Jul 2013 21:09:41 +0000
|
||||
Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to
|
||||
host binaries
|
||||
|
||||
Upstream-Status: Inappropiate (configuration)
|
||||
|
||||
Signed-off-by: Simon Busch <morphis@gravedo.de>
|
||||
---
|
||||
src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
|
||||
src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
|
||||
src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
index a804278..b6fbbea 100644
|
||||
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
_qt5_Core_check_file_exists(${imported_location})
|
||||
|
||||
@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
_qt5_Core_check_file_exists(${imported_location})
|
||||
|
||||
@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
_qt5_Core_check_file_exists(${imported_location})
|
||||
|
||||
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
index 1d94715..3209e42 100644
|
||||
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
_qt5_DBus_check_file_exists(${imported_location})
|
||||
|
||||
@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
_qt5_DBus_check_file_exists(${imported_location})
|
||||
|
||||
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
index e5650ff..7fb8b21 100644
|
||||
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
_qt5_Widgets_check_file_exists(${imported_location})
|
||||
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hartmann <phartmann@blackberry.com>
|
||||
Date: Thu, 25 Jul 2013 12:05:29 -0400
|
||||
Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method
|
||||
|
||||
When readData() is called repeatedly, we need to keep track which
|
||||
part of the multipart message we are currently reading from.
|
||||
Hereby we also need to take the boundary size into account, and not
|
||||
only the size of the multipart; otherwise we would skip a not
|
||||
completely read part. This would then later lead to advancing the
|
||||
read pointer by negative indexes and data loss.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61698]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-32534
|
||||
Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
|
||||
Reviewed-by: Jonathan Liu <net147@gmail.com>
|
||||
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
||||
---
|
||||
src/network/access/qhttpmultipart.cpp | 3 +-
|
||||
.../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++
|
||||
2 files changed, 46 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
|
||||
index 4397ef8..5985ed9 100644
|
||||
--- a/src/network/access/qhttpmultipart.cpp
|
||||
+++ b/src/network/access/qhttpmultipart.cpp
|
||||
@@ -497,7 +497,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize)
|
||||
|
||||
// skip the parts we have already read
|
||||
while (index < multiPart->parts.count() &&
|
||||
- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size())
|
||||
+ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()
|
||||
+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart
|
||||
index++;
|
||||
|
||||
// read the data
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shaw <andy.shaw@digia.com>
|
||||
Date: Tue, 8 Oct 2013 15:45:42 +0200
|
||||
Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
|
||||
|
||||
Task-number: QTBUG-31579
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/painting/qcosmeticstroker.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
|
||||
index 39f6422..a2301e3 100644
|
||||
--- a/src/gui/painting/qcosmeticstroker.cpp
|
||||
+++ b/src/gui/painting/qcosmeticstroker.cpp
|
||||
@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
|
||||
ymax = deviceRect.bottom() + 2;
|
||||
|
||||
lastPixel.x = -1;
|
||||
+ lastPixel.y = -1;
|
||||
}
|
||||
|
||||
// returns true if the whole line gets clipped away
|
||||
@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
|
||||
QPointF p = QPointF(points[0], points[1]) * state->matrix;
|
||||
patternOffset = state->lastPen.dashOffset()*64;
|
||||
lastPixel.x = -1;
|
||||
+ lastPixel.y = -1;
|
||||
|
||||
bool closed;
|
||||
const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
|
||||
@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
|
||||
QPointF movedTo = p;
|
||||
patternOffset = state->lastPen.dashOffset()*64;
|
||||
lastPixel.x = -1;
|
||||
+ lastPixel.y = -1;
|
||||
|
||||
const qreal *begin = points;
|
||||
const qreal *end = points + 2*path.elementCount();
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
Date: Wed, 23 Oct 2013 00:28:17 +1100
|
||||
Subject: [PATCH] Fix misaligned selection region with text when centered
|
||||
|
||||
If the text is centered, the x/y position in the selection QRectF may
|
||||
be a multiple of 0.5 which is rounded up. This rounding causes
|
||||
misalignment of the selection region with the text.
|
||||
|
||||
The alignment is fixed by using qFloor on the x and y components.
|
||||
|
||||
Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842]
|
||||
Signed-off-by: Jonathan Liu <net147@gmail.com>
|
||||
|
||||
Task-number: QTBUG-34218
|
||||
Task-number: QTBUG-34234
|
||||
Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
|
||||
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
||||
---
|
||||
src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
|
||||
1 file changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
||||
index 54d337e..66341e1 100644
|
||||
--- a/src/gui/text/qtextlayout.cpp
|
||||
+++ b/src/gui/text/qtextlayout.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
|
||||
#include <qthread.h>
|
||||
#include <qfont.h>
|
||||
+#include <qmath.h>
|
||||
#include <qpainter.h>
|
||||
#include <qvarlengtharray.h>
|
||||
#include <qtextformat.h>
|
||||
@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
|
||||
continue;
|
||||
}
|
||||
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ if (lastSelectionWidth > 0) {
|
||||
+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
||||
+ rect.moveLeft(qFloor(rect.left()));
|
||||
+ rect.moveTop(qFloor(rect.top()));
|
||||
+ region->addRect(rect);
|
||||
+ }
|
||||
|
||||
lastSelectionX = selectionX;
|
||||
lastSelectionWidth = selectionWidth;
|
||||
}
|
||||
}
|
||||
- if (lastSelectionWidth > 0)
|
||||
- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
|
||||
+ if (lastSelectionWidth > 0) {
|
||||
+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
|
||||
+ rect.moveLeft(qFloor(rect.left()));
|
||||
+ rect.moveTop(qFloor(rect.top()));
|
||||
+ region->addRect(rect);
|
||||
+ }
|
||||
}
|
||||
|
||||
static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
|
||||
@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
|
||||
|
||||
QBrush bg = chf.background();
|
||||
if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
|
||||
- p->fillRect(r, bg);
|
||||
+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
|
||||
if (c.style() != Qt::NoBrush) {
|
||||
p->setPen(QPen(c, 0));
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -7,28 +7,24 @@ QT_MODULE = "qtbase"
|
|||
|
||||
require qt5-native.inc
|
||||
|
||||
# shared with target qtbase, all except
|
||||
# 0005-qmake-is-already-built-in-qtbase-native.patch
|
||||
# 0006-Allow-building-a-separate-qmake-for-the-target.patch
|
||||
|
||||
SRC_URI += " \
|
||||
# common with target version
|
||||
# common with -native and target version
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
|
||||
file://0003-Add-external-hostbindir-option.patch \
|
||||
file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
|
||||
file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0008-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0009-qt_module-Fix-paths-in-.prl-files.patch \
|
||||
file://0010-wayland-scanner-disable-silent-rules.patch \
|
||||
file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0013-Disable-mkv8snapshot.patch \
|
||||
file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
|
||||
file://0015-qtbase-allow-build-of-examples.patch \
|
||||
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0005-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
|
||||
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
|
||||
"
|
||||
|
||||
# specific for native version
|
||||
SRC_URI += "file://0001-Always-build-uic.patch"
|
||||
SRC_URI += " \
|
||||
file://0010-Always-build-uic.patch \
|
||||
"
|
||||
|
||||
QT_CONF_PATH = "${B}/qt.conf"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@ do_install_append() {
|
|||
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
|
||||
}
|
||||
|
||||
SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd"
|
||||
SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
|
||||
SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
|
||||
SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
|
||||
|
|
@ -1,10 +1,31 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
# common with target version
|
||||
SRC_URI = "\
|
||||
git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
|
||||
file://0003-Add-external-hostbindir-option.patch \
|
||||
file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
|
||||
file://0005-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0006-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0007-qt_module-Fix-paths-in-.prl-files.patch \
|
||||
file://0008-wayland-scanner-disable-silent-rules.patch \
|
||||
file://0009-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0010-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0011-configure-make-pulseaudio-a-configurable-option.patch \
|
||||
file://0012-configure-make-alsa-a-configurable-option.patch \
|
||||
file://0013-configure-make-freetype-a-configurable-option.patch \
|
||||
file://0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
|
||||
"
|
||||
|
||||
SRC_URI += "file://0015-Always-build-uic.patch"
|
||||
|
||||
do_install_append() {
|
||||
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
|
||||
# e.g. qt3d, qtwayland
|
||||
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
|
||||
}
|
||||
|
||||
SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a"
|
||||
SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
|
||||
|
|
|
|||
|
|
@ -1,29 +1,24 @@
|
|||
require qt5.inc
|
||||
|
||||
SRC_URI += " \
|
||||
# common with -native
|
||||
SRC_URI += "\
|
||||
file://0001-Add-linux-oe-g-platform.patch \
|
||||
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
|
||||
file://0003-Add-external-hostbindir-option.patch \
|
||||
file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
|
||||
file://0005-qmake-is-already-built-in-qtbase-native.patch \
|
||||
file://0006-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||
file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0008-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0009-qt_module-Fix-paths-in-.prl-files.patch \
|
||||
file://0010-wayland-scanner-disable-silent-rules.patch \
|
||||
file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0013-Disable-mkv8snapshot.patch \
|
||||
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
||||
file://0005-qt_module-Fix-pkgconfig-replacement.patch \
|
||||
file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
||||
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
|
||||
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
|
||||
"
|
||||
|
||||
SRC_URI += "\
|
||||
file://0010-qmake-is-already-built-in-qtbase-native.patch \
|
||||
file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||
file://0012-qtbase-allow-build-of-examples.patch \
|
||||
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
|
||||
file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
|
||||
file://0015-qtbase-allow-build-of-examples.patch \
|
||||
file://0018-QOpenGLPaintDevice-sub-area-support.patch \
|
||||
file://0020-Use-BGRA-extension-in-bindTexture.patch \
|
||||
file://0021-configure-make-pulseaudio-a-configurable-option.patch \
|
||||
file://0022-configure-make-alsa-a-configurable-option.patch \
|
||||
file://0023-configure-make-freetype-a-configurable-option.patch \
|
||||
file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
|
||||
file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
|
||||
file://0027-Fix-misaligned-selection-region-with-text-when-cente.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase-native"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 14fcd5be6d0665b5803a90a1b7887943b350285f Mon Sep 17 00:00:00 2001
|
||||
From f4fd2da9b29db23638ad07bd35f093f793241526 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 01/23] Add linux-oe-g++ platform
|
||||
Subject: [PATCH 01/14] Add linux-oe-g++ platform
|
||||
|
||||
* This qmake.conf unlike other platforms reads most variables from
|
||||
shell environment, because it's easier for qt recipes to export
|
||||
|
|
@ -41,10 +41,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 938b23b..dacfd30 100755
|
||||
index a330dd6..1b328ae 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -291,6 +291,16 @@ getQMakeConf()
|
||||
@@ -324,6 +324,16 @@ getQMakeConf()
|
||||
getSingleQMakeVariable "$1" "$specvals"
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ index 938b23b..dacfd30 100755
|
|||
getXQMakeConf()
|
||||
{
|
||||
if [ -z "$xspecvals" ]; then
|
||||
@@ -300,6 +310,16 @@ getXQMakeConf()
|
||||
@@ -333,6 +343,16 @@ getXQMakeConf()
|
||||
getSingleQMakeVariable "$1" "$xspecvals"
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ index 938b23b..dacfd30 100755
|
|||
compilerSupportsFlag()
|
||||
{
|
||||
cat >conftest.cpp <<EOF
|
||||
@@ -816,6 +836,18 @@ fi
|
||||
@@ -548,6 +568,18 @@ fi
|
||||
# initalize variables
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ index 938b23b..dacfd30 100755
|
|||
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||
for varname in $SYSTEM_VARIABLES; do
|
||||
qmakevarname="${varname}"
|
||||
@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
|
||||
@@ -3344,7 +3376,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
|
||||
CFG_QGTKSTYLE=no
|
||||
fi
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ index 938b23b..dacfd30 100755
|
|||
|
||||
TEST_COMPILER=$QMAKE_CONF_COMPILER
|
||||
|
||||
@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
|
||||
@@ -3379,7 +3411,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -115,7 +115,7 @@ index 938b23b..dacfd30 100755
|
|||
|
||||
GCC_MACHINE_DUMP=
|
||||
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
|
||||
@@ -3967,6 +3999,14 @@ setBootstrapVariable()
|
||||
@@ -3860,6 +3892,14 @@ setBootstrapVariable()
|
||||
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
|
||||
}
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ index 938b23b..dacfd30 100755
|
|||
# build qmake
|
||||
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
echo "Creating qmake..."
|
||||
@@ -4005,11 +4045,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
@@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
fi
|
||||
|
||||
[ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
|
||||
|
|
@ -300,5 +300,5 @@ index 0000000..dd12003
|
|||
+
|
||||
+#endif // QPLATFORMDEFS_H
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 64ac02980780a099618b8d47803a1e4da6016c84 Mon Sep 17 00:00:00 2001
|
||||
From c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001
|
||||
From: Holger Freyther <zecke@selfish.org>
|
||||
Date: Wed, 26 Sep 2012 17:22:30 +0200
|
||||
Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside
|
||||
Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside
|
||||
using the environment
|
||||
|
||||
Allow to set a qt.conf from the outside using the environment. This allows
|
||||
|
|
@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||
index 53a3ebb..8ca2102 100644
|
||||
index 1c3b09f..c647a16 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||
@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
|
||||
@@ -149,7 +149,10 @@ QLibrarySettings::QLibrarySettings()
|
||||
|
||||
QSettings *QLibraryInfoPrivate::findConfiguration()
|
||||
{
|
||||
|
|
@ -32,5 +32,5 @@ index 53a3ebb..8ca2102 100644
|
|||
if(!QFile::exists(qtconfig))
|
||||
qtconfig = qt_libraryInfoFile();
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,50 +1,55 @@
|
|||
From 6e92a3eac477a534226f916018a6ba6996eff318 Mon Sep 17 00:00:00 2001
|
||||
From 21c595fd0e386bea1a2e2b19323dc517bb2c7333 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 03/23] Add -external-hostbindir option
|
||||
Subject: [PATCH 03/14] Add -external-hostbindir option
|
||||
|
||||
* when cross-compiling it's sometimes useful to use existing tools from machine
|
||||
(or in OpenEmbedded built with separate native recipe) when building for target
|
||||
|
||||
* this way we can skip bootstraping tools we already have
|
||||
|
||||
* qt_functions: temporary remove isEmpty check
|
||||
* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
|
||||
* isEmpty works correctly only with qmake variables (e.g. $$FOO -
|
||||
isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 14 ++++++++++++++
|
||||
mkspecs/features/qt_functions.prf | 5 ++++-
|
||||
mkspecs/features/qt_tool.prf | 2 +-
|
||||
configure | 15 +++++++++++++++
|
||||
mkspecs/features/qt_functions.prf | 9 ++++++++-
|
||||
mkspecs/features/qt_tool.prf | 3 +--
|
||||
qmake/property.cpp | 1 +
|
||||
qtbase.pro | 12 +++++++++---
|
||||
src/corelib/global/qlibraryinfo.cpp | 3 ++-
|
||||
src/corelib/global/qlibraryinfo.h | 1 +
|
||||
tools/configure/configureapp.cpp | 8 ++++++++
|
||||
8 files changed, 40 insertions(+), 6 deletions(-)
|
||||
8 files changed, 45 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index dacfd30..25980c0 100755
|
||||
index 1b328ae..46f7230 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX=
|
||||
QT_HOST_BINS=
|
||||
@@ -785,6 +785,7 @@ QT_HOST_BINS=
|
||||
QT_HOST_LIBS=
|
||||
QT_HOST_DATA=
|
||||
QT_EXT_PREFIX=
|
||||
+QT_EXTERNAL_HOST_BINS=
|
||||
|
||||
#flags for SQL drivers
|
||||
QT_CFLAGS_PSQL=
|
||||
@@ -1170,6 +1171,7 @@ while [ "$#" -gt 0 ]; do
|
||||
@@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do
|
||||
-testsdir| \
|
||||
-hostdatadir| \
|
||||
-hostbindir| \
|
||||
+ -external-hostbindir| \
|
||||
-hostlibdir| \
|
||||
-extprefix| \
|
||||
-sysroot| \
|
||||
-depths| \
|
||||
@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do
|
||||
hostlibdir)
|
||||
QT_HOST_LIBS="$VAL"
|
||||
@@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do
|
||||
extprefix)
|
||||
QT_EXT_PREFIX="$VAL"
|
||||
;;
|
||||
+ external-hostbindir)
|
||||
+ QT_EXTERNAL_HOST_BINS="$VAL"
|
||||
|
|
@ -52,29 +57,30 @@ index dacfd30..25980c0 100755
|
|||
pkg-config)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_PKGCONFIG="$VAL"
|
||||
@@ -3248,6 +3253,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
|
||||
QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
|
||||
fi
|
||||
|
||||
+# default is empty, don't call makeabs if it is empty
|
||||
+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
|
||||
+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
|
||||
+fi
|
||||
+
|
||||
#-------------------------------------------------------------------------------
|
||||
# help - interactive parts of the script _after_ this section please
|
||||
#-------------------------------------------------------------------------------
|
||||
@@ -3416,6 +3426,9 @@ Installation options:
|
||||
@@ -2226,6 +2231,10 @@ Installation options:
|
||||
-hostdatadir <dir> . Data used by qmake will be installed to <dir>
|
||||
(default HOSTPREFIX)
|
||||
|
||||
+ -external-hostbindir <dir> Use external host executables instead of building them
|
||||
+ (not used by defaut)
|
||||
+
|
||||
+
|
||||
Configure options:
|
||||
|
||||
The defaults (*) are usually acceptable. A plus (+) denotes a default value
|
||||
@@ -3931,6 +3944,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
|
||||
@@ -3133,6 +3142,11 @@ fi
|
||||
# command line and environment validation
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
+# default is empty, don't call makeabs if it is empty
|
||||
+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
|
||||
+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
|
||||
+fi
|
||||
+
|
||||
# update QT_CONFIG to show our current predefined configuration
|
||||
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
|
||||
case "$CFG_QCONFIG" in
|
||||
@@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
|
||||
"qt_hbinpath=$QT_HOST_BINS",
|
||||
"qt_hlibpath=$QT_HOST_LIBS",
|
||||
"qt_hdatpath=$QT_HOST_DATA",
|
||||
|
|
@ -83,36 +89,41 @@ index dacfd30..25980c0 100755
|
|||
"qt_hostspec=$shortspec",
|
||||
#endif
|
||||
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
|
||||
index 2f2c94c..4e12d3d 100644
|
||||
index 1dacfed..7229845 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) {
|
||||
@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
|
||||
defineTest(qtPrepareTool) {
|
||||
$$1 = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty($$1) {
|
||||
- $$1 = $$[QT_HOST_BINS]/$$2
|
||||
+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
|
||||
+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+ # for some reason isEmpty does not work here, FIXME before submitting upstream
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
|
||||
+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
|
||||
+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
|
||||
+ $$1 = $$[QT_HOST_BINS]/$$2
|
||||
+ }
|
||||
exists($$eval($$1).pl) {
|
||||
$$1 = perl -w $$eval($$1).pl
|
||||
} else: contains(QMAKE_HOST.os, Windows) {
|
||||
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
|
||||
index 9a6b963..83ef3a0 100644
|
||||
index f0864f9..50bfac8 100644
|
||||
--- a/mkspecs/features/qt_tool.prf
|
||||
+++ b/mkspecs/features/qt_tool.prf
|
||||
@@ -16,7 +16,7 @@ CONFIG += console
|
||||
@@ -15,8 +15,7 @@ CONFIG += console
|
||||
|
||||
# If we are doing a prefix build, create a "module" pri which enables
|
||||
# qtPrepareTool() to work with the non-installed build.
|
||||
# Non-bootstrapped tools always need this because of the environment setup.
|
||||
-# Non-bootstrapped tools always need this because of the environment setup.
|
||||
-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
|
||||
+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
|
||||
isEmpty(MODULE):MODULE = $$TARGET
|
||||
|
||||
!host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
|
||||
!host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
|
||||
diff --git a/qmake/property.cpp b/qmake/property.cpp
|
||||
index 4685440..93eb1d4 100644
|
||||
index e50485c..71291ad 100644
|
||||
--- a/qmake/property.cpp
|
||||
+++ b/qmake/property.cpp
|
||||
@@ -75,6 +75,7 @@ static const struct {
|
||||
|
|
@ -124,7 +135,7 @@ index 4685440..93eb1d4 100644
|
|||
{ "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
|
||||
};
|
||||
diff --git a/qtbase.pro b/qtbase.pro
|
||||
index d6726b5..28ca7d5 100644
|
||||
index 7576db7..d51af0e 100644
|
||||
--- a/qtbase.pro
|
||||
+++ b/qtbase.pro
|
||||
@@ -70,16 +70,22 @@ CONFIG -= qt
|
||||
|
|
@ -154,10 +165,10 @@ index d6726b5..28ca7d5 100644
|
|||
|
||||
# If we are doing a prefix build, create a "module" pri which enables
|
||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
||||
index 8ca2102..9f5d444 100644
|
||||
index c647a16..da82913 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||
@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
|
||||
@@ -281,7 +281,7 @@ QLibraryInfo::isDebugBuild()
|
||||
*/
|
||||
|
||||
static const struct {
|
||||
|
|
@ -166,7 +177,7 @@ index 8ca2102..9f5d444 100644
|
|||
} qtConfEntries[] = {
|
||||
{ "Prefix", "." },
|
||||
{ "Documentation", "doc" }, // should be ${Data}/doc
|
||||
@@ -296,6 +296,7 @@ static const struct {
|
||||
@@ -307,6 +307,7 @@ static const struct {
|
||||
{ "HostBinaries", "bin" },
|
||||
{ "HostLibraries", "lib" },
|
||||
{ "HostData", "." },
|
||||
|
|
@ -175,7 +186,7 @@ index 8ca2102..9f5d444 100644
|
|||
{ "HostSpec", "" },
|
||||
#endif
|
||||
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
|
||||
index b275e01..0e6baed 100644
|
||||
index 17864b5..a14bc0f 100644
|
||||
--- a/src/corelib/global/qlibraryinfo.h
|
||||
+++ b/src/corelib/global/qlibraryinfo.h
|
||||
@@ -84,6 +84,7 @@ public:
|
||||
|
|
@ -187,11 +198,11 @@ index b275e01..0e6baed 100644
|
|||
HostSpecPath,
|
||||
LastHostPath = HostSpecPath,
|
||||
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
|
||||
index 5b62e8f..c752df3 100644
|
||||
index e2fef2c..ab475c3 100644
|
||||
--- a/tools/configure/configureapp.cpp
|
||||
+++ b/tools/configure/configureapp.cpp
|
||||
@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine()
|
||||
dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
|
||||
@@ -1186,6 +1186,13 @@ void Configure::parseCmdLine()
|
||||
dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
|
||||
}
|
||||
|
||||
+ else if (configCmdLine.at(i) == "-external-hostbindir") {
|
||||
|
|
@ -204,7 +215,7 @@ index 5b62e8f..c752df3 100644
|
|||
else if (configCmdLine.at(i) == "-make-tool") {
|
||||
++i;
|
||||
if (i == argCount)
|
||||
@@ -3715,6 +3722,7 @@ void Configure::generateQConfigCpp()
|
||||
@@ -3852,6 +3859,7 @@ void Configure::generateQConfigCpp()
|
||||
<< " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
|
||||
<< " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
|
||||
<< " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
|
||||
|
|
@ -213,5 +224,5 @@ index 5b62e8f..c752df3 100644
|
|||
<< " \"qt_hostspec=" << hostSpec << "\"," << endl
|
||||
<< "#endif" << endl
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sat, 27 Apr 2013 22:33:33 +0200
|
||||
Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with
|
||||
SYSROOT
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
tools/configure/configureapp.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
|
||||
index ab475c3..68cd43d 100644
|
||||
--- a/tools/configure/configureapp.cpp
|
||||
+++ b/tools/configure/configureapp.cpp
|
||||
@@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri()
|
||||
configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
|
||||
if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
|
||||
// FIXME: add detection
|
||||
- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
|
||||
- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
|
||||
+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
|
||||
+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
|
||||
}
|
||||
configStream << "}" << endl;
|
||||
if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
From 33bbb10c66df59abfad9f4576462f63dfb500149 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 05/14] qt_module: Fix pkgconfig replacement
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* in situation like this:
|
||||
QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
|
||||
QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
|
||||
QT_INSTALL_LIBS/raw:/usr/lib
|
||||
QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
|
||||
|
||||
I don't want the replacement like this:
|
||||
sed
|
||||
-e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
|
||||
-e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
|
||||
"../../lib/pkgconfig/Qt5Core.pc"
|
||||
>"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
|
||||
because that way I'll end with -L/usr/lib in .pc file which is
|
||||
cross-compile unfriendly, keeping ${libdir}/${includedir} works better
|
||||
in my case
|
||||
|
||||
* qt_module: Fix paths in .prl files
|
||||
* qmake does not prefix them with QT_SYSROOT when using them
|
||||
so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
|
||||
variable, which is unsafe for cross-compilation
|
||||
* writting QT_SYSROOT in .prl files is dangerous for sstate when
|
||||
builds are in different directories, so we need
|
||||
SSTATE_SCAN_FILES += "*.pri *.prl"
|
||||
to make them relocateble
|
||||
|
||||
* fix paths in packageconfig files
|
||||
This reverts parts of:
|
||||
enable path replacement in installed prl files on all platforms
|
||||
Task-number: QTBUG-33794
|
||||
Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
|
||||
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
mkspecs/features/qt_module.prf | 43 ++++++++++++++++++++++++++++++------------
|
||||
1 file changed, 31 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index 11509ee..2f95684 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -135,30 +135,49 @@ load(qt_installs)
|
||||
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
||||
else: \
|
||||
rplbase = $$MODULE_BASE_OUTDIR
|
||||
-include_replace.match = $$rplbase/include
|
||||
-include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
-include_replace.CONFIG = path
|
||||
-lib_replace.match = $$rplbase/lib
|
||||
-host_build: \
|
||||
- lib_replace.replace = $$[QT_HOST_LIBS]
|
||||
-else: \
|
||||
+pkgconfig_include_replace.match = $$rplbase/include
|
||||
+pkgconfig_include_replace.replace = "\$$\\{includedir}"
|
||||
+pkgconfig_lib_replace.match = $$rplbase/lib
|
||||
+pkgconfig_lib_replace.replace = "\$$\\{libdir}"
|
||||
+!exists($$[QT_SYSROOT]) {
|
||||
+ include_replace.match = $$rplbase/include
|
||||
+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||
+ include_replace.CONFIG = path
|
||||
+ lib_replace.match = $$rplbase/lib
|
||||
lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
-lib_replace.CONFIG = path
|
||||
+ lib_replace.CONFIG = path
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
|
||||
+} else {
|
||||
+ # include_replace and lib_replace are duplicate, but we don't want to
|
||||
+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
|
||||
+ include_replace.match = $$rplbase
|
||||
+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
|
||||
+ include_replace.CONFIG = path
|
||||
+ lib_replace.match = $$rplbase
|
||||
+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
|
||||
+ lib_replace.CONFIG = path
|
||||
+ lafile_replace.match = $$rplbase
|
||||
+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
|
||||
+}
|
||||
QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
|
||||
|
||||
unix|win32-g++* {
|
||||
CONFIG += create_pc
|
||||
- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
|
||||
- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
|
||||
+ host_build: \
|
||||
+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
|
||||
+ else: \
|
||||
+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
|
||||
+ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
|
||||
QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
|
||||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||
- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
|
||||
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
|
||||
}
|
||||
|
||||
unix {
|
||||
CONFIG += create_libtool explicitlib
|
||||
QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace
|
||||
- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
|
||||
+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
|
||||
}
|
||||
|
||||
unix|win32-g++* {
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001
|
||||
From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Wed, 8 May 2013 23:54:35 +0200
|
||||
Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars
|
||||
Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars
|
||||
|
||||
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
|
||||
causing issues as we need g++ to be used as linker
|
||||
|
|
@ -10,14 +10,14 @@ Upstream-Status: Pending
|
|||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 15 +--------------
|
||||
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||
configure | 14 --------------
|
||||
1 file changed, 14 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 74f9e65..7a9a77c 100755
|
||||
index 46f7230..96c56c8 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -849,20 +849,7 @@ fi'`
|
||||
@@ -581,20 +581,6 @@ fi'`
|
||||
done
|
||||
|
||||
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||
|
|
@ -35,10 +35,9 @@ index 74f9e65..7a9a77c 100755
|
|||
-fi'`
|
||||
- eval "$cmd"
|
||||
-done
|
||||
+
|
||||
# Use CC/CXX to run config.tests
|
||||
mkdir -p "$outpath/config.tests"
|
||||
rm -f "$outpath/config.tests/.qmake.cache"
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From b4f8c636cb265951979868a65006ce49f442e5e7 Mon Sep 17 00:00:00 2001
|
||||
From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Thu, 9 May 2013 10:06:50 +0200
|
||||
Subject: [PATCH 12/22] configure.prf: Allow to add extra arguments to make
|
||||
Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make
|
||||
|
||||
* sometimes we would like to add -e or define some variable and respect it from both
|
||||
Makefiles used in configure tests and also Makefiles to build the application
|
||||
|
|
@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
|
||||
index b4569df..d189e50 100644
|
||||
index 39144e7..de48b07 100644
|
||||
--- a/mkspecs/features/configure.prf
|
||||
+++ b/mkspecs/features/configure.prf
|
||||
@@ -57,12 +57,12 @@ defineTest(qtCompileTest) {
|
||||
@@ -54,12 +54,12 @@ defineTest(qtCompileTest) {
|
||||
qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
|
||||
|
||||
# Clean up after previous run
|
||||
|
|
@ -33,5 +33,5 @@ index b4569df..d189e50 100644
|
|||
msg = "test $$1 succeeded"
|
||||
write_file($$QMAKE_CONFIG_LOG, msg, append)
|
||||
--
|
||||
1.8.3.1
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Tue, 28 Feb 2012 15:10:24 +0000
|
||||
Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a
|
||||
configurable option
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
configure | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 96c56c8..b3854aa 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do
|
||||
UNKNOWN_OPT=yes
|
||||
fi
|
||||
;;
|
||||
+ pulseaudio)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
+ CFG_PULSEAUDIO="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
+ alsa)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
+ CFG_ALSA="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
+ freetype)
|
||||
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
|
||||
+ CFG_LIBFREETYPE="$VAL"
|
||||
+ else
|
||||
+ UNKNOWN_OPT=yes
|
||||
+ fi
|
||||
+ ;;
|
||||
gtkstyle)
|
||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||
CFG_QGTKSTYLE="$VAL"
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
From b4d383bf47374c7132ecbcaec2c6aea31f858f54 Mon Sep 17 00:00:00 2001
|
||||
From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001
|
||||
From: Simon Busch <morphis@gravedo.de>
|
||||
Date: Mon, 22 Jul 2013 21:09:41 +0000
|
||||
Subject: [PATCH 21/22] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path
|
||||
to host binaries
|
||||
Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to
|
||||
determine path to host binaries
|
||||
|
||||
Upstream-Status: Inappropiate (configuration)
|
||||
|
||||
Signed-off-by: Simon Busch <morphis@gravedo.de>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
|
||||
src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
|
||||
|
|
@ -14,7 +15,7 @@ Signed-off-by: Simon Busch <morphis@gravedo.de>
|
|||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
index e01b448..5382730 100644
|
||||
index 1e00c74..a99b5bf 100644
|
||||
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
|
||||
|
|
@ -80,5 +81,5 @@ index e5650ff..16ff007 100644
|
|||
_qt5_Widgets_check_file_exists(${imported_location})
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba 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 10/12] Always build uic
|
||||
|
||||
Even if we are not building gui or widgets. This tool is needed later
|
||||
as a native tool when compiling the target.
|
||||
|
||||
Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/src.pro | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index b7887a6..8801544 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
|
||||
}
|
||||
}
|
||||
}
|
||||
-SUBDIRS += src_plugins src_tools_qdoc
|
||||
+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
|
||||
|
||||
nacl: SUBDIRS -= src_network src_testlib
|
||||
|
||||
@@ -156,4 +156,4 @@ TR_EXCLUDE = \
|
||||
src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
|
||||
|
||||
sub-tools.depends = $$TOOLS
|
||||
-QMAKE_EXTRA_TARGETS = sub-tools
|
||||
\ No newline at end of file
|
||||
+QMAKE_EXTRA_TARGETS = sub-tools
|
||||
--
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 777d4bfc7a94256ec46f61bd80bc6058cdf55ebb Mon Sep 17 00:00:00 2001
|
||||
From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Krelin <hacker@klever.net>
|
||||
Date: Mon, 29 Oct 2012 20:07:49 -0700
|
||||
Subject: [PATCH 05/22] qmake is already built in qtbase-native
|
||||
Subject: [PATCH 10/14] qmake is already built in qtbase-native
|
||||
|
||||
Ported from OE by: Yu Ke <ke.yu@intel.com>
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
|
@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 39a5deb..40f2b02 100755
|
||||
index b3854aa..15c89c7 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4014,7 +4014,7 @@ setBootstrapEvalVariable()
|
||||
@@ -3923,7 +3923,7 @@ setBootstrapEvalVariable()
|
||||
|
||||
|
||||
# build qmake
|
||||
|
|
@ -26,5 +26,5 @@ index 39a5deb..40f2b02 100755
|
|||
|
||||
mkdir -p "$outpath/qmake" || exit
|
||||
--
|
||||
1.8.3.1
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From c36477f621c7d682ee7140156127ad32e91a40ad Mon Sep 17 00:00:00 2001
|
||||
From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
Date: Mon, 29 Oct 2012 20:26:36 -0700
|
||||
Subject: [PATCH 06/22] Allow building a separate qmake for the target
|
||||
Subject: [PATCH 11/14] Allow building a separate qmake for the target
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
|
|
@ -9,21 +9,22 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
|||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
qmake/qmake.pro | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
qmake/qmake.pro | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
|
||||
index a81d0cd..ed7aebf 100644
|
||||
index 89d6ea5..7c605b9 100644
|
||||
--- a/qmake/qmake.pro
|
||||
+++ b/qmake/qmake.pro
|
||||
@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic
|
||||
DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
|
||||
PROEVALUATOR_FULL PROEVALUATOR_DEBUG
|
||||
DESTDIR = ../bin/
|
||||
@@ -8,6 +8,8 @@ CONFIG -= qt
|
||||
DEFINES += \
|
||||
QT_BUILD_QMAKE \
|
||||
PROEVALUATOR_FULL
|
||||
+DESTDIR = ../bin/
|
||||
+TARGET = qmake
|
||||
|
||||
OBJECTS_DIR = .
|
||||
MOC_DIR = .
|
||||
VPATH += \
|
||||
../src/corelib/global \
|
||||
--
|
||||
1.8.3.1
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
From 6cd7ade28662730e5de89a171501e3902b321ffc Mon Sep 17 00:00:00 2001
|
||||
From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001
|
||||
From: Denys Dmytriyenko <denys@ti.com>
|
||||
Date: Mon, 11 Nov 2013 20:22:34 -0500
|
||||
Subject: [PATCH] configure: preserve built qmake and swap with native one
|
||||
Subject: [PATCH 11/12] configure: preserve built qmake and swap with native
|
||||
one
|
||||
|
||||
Let configure script build the real qmake, but right after it's built, swap
|
||||
it with a native qmake for further internal use, preserving the real one.
|
||||
|
|
@ -12,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
|||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 140c7b4..304d30f 100755
|
||||
index b3854aa..20836a6 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4104,6 +4104,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
@@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
||||
|
||||
(cd "$outpath/qmake"; "$MAKE") || exit 2
|
||||
fi # Build qmake
|
||||
|
|
@ -25,5 +26,5 @@ index 140c7b4..304d30f 100755
|
|||
echo "Running configuration tests..."
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 9500744fee36c908d0cb7e034f8c8dd3dd1c4fa4 Mon Sep 17 00:00:00 2001
|
||||
From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001
|
||||
From: Denys Dmytriyenko <denys@ti.com>
|
||||
Date: Mon, 11 Nov 2013 20:27:30 -0500
|
||||
Subject: [PATCH] configure: bump path length from 256 to 512 characters
|
||||
Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters
|
||||
|
||||
Increase the path length that gets hardcoded into generated config.cpp file
|
||||
from 256 to 512 characters, as nativesdk path can be quite long.
|
||||
|
|
@ -12,18 +12,18 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 304d30f..a37a587 100755
|
||||
index 20836a6..50661f4 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3870,7 +3870,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
|
||||
@@ -3805,7 +3805,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
|
||||
static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
|
||||
|
||||
/* Installation Info */
|
||||
-static const char qt_configure_prefix_path_strs[][256 + 12] = {
|
||||
+static const char qt_configure_prefix_path_strs[][512 + 12] = {
|
||||
"qt_prfxpath=$QT_INSTALL_PREFIX",
|
||||
"qt_docspath=$QT_INSTALL_DOCS",
|
||||
"qt_hdrspath=$QT_INSTALL_HEADERS",
|
||||
#ifndef QT_BUILD_QMAKE
|
||||
"qt_prfxpath=$QT_SYSROOT_PREFIX",
|
||||
"qt_docspath=$QT_SYSROOT_DOCS",
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001
|
||||
From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||
Date: Sat, 25 May 2013 17:34:32 +0200
|
||||
Subject: [PATCH 15/23] qtbase: allow build of examples
|
||||
Subject: [PATCH 12/14] qtbase: allow build of examples
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644
|
|||
- }
|
||||
}
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From b485950725b776bc1f0cf4edd5330d61732262cb Mon Sep 17 00:00:00 2001
|
||||
From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf 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 18/23] QOpenGLPaintDevice sub-area support
|
||||
Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support
|
||||
|
||||
Allows creating QOpenGLPaintDevice targetting sub-area
|
||||
of binded framebuffer.
|
||||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
|||
5 files changed, 23 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
|
||||
index f0e7e49..fe9a30c 100644
|
||||
index fa392d1..5df1762 100644
|
||||
--- a/src/gui/opengl/qopenglpaintdevice.cpp
|
||||
+++ b/src/gui/opengl/qopenglpaintdevice.cpp
|
||||
@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
|
||||
|
|
@ -76,10 +76,10 @@ index c05571c..01eb1bc 100644
|
|||
void setSize(const QSize &size);
|
||||
void setDevicePixelRatio(qreal devicePixelRatio);
|
||||
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
|
||||
index 78f5080..20db620 100644
|
||||
index 0513551..f6aeb15 100644
|
||||
--- a/src/gui/opengl/qopenglpaintengine.cpp
|
||||
+++ b/src/gui/opengl/qopenglpaintengine.cpp
|
||||
@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
|
||||
@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
|
||||
for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
|
||||
d->vertexAttributeArraysEnabledState[i] = false;
|
||||
|
||||
|
|
@ -90,7 +90,7 @@ index 78f5080..20db620 100644
|
|||
d->width = sz.width();
|
||||
d->height = sz.height();
|
||||
d->mode = BrushDrawingMode;
|
||||
@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
|
||||
@@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
|
||||
d->device->ensureActiveTarget();
|
||||
|
||||
d->transferMode(BrushDrawingMode);
|
||||
|
|
@ -99,7 +99,7 @@ index 78f5080..20db620 100644
|
|||
d->needsSync = false;
|
||||
d->lastMaskTextureUsed = 0;
|
||||
d->shaderManager->setDirty();
|
||||
@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
|
||||
@@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
|
||||
if (bounds == QRect(0, 0, width, height)) {
|
||||
glDisable(GL_SCISSOR_TEST);
|
||||
} else {
|
||||
|
|
@ -107,7 +107,7 @@ index 78f5080..20db620 100644
|
|||
glEnable(GL_SCISSOR_TEST);
|
||||
setScissor(bounds);
|
||||
}
|
||||
@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
|
||||
@@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
|
||||
|
||||
void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
|
||||
{
|
||||
|
|
@ -137,10 +137,10 @@ index d51f0e5..0d4b38d 100644
|
|||
QOpenGLContext *ctx;
|
||||
EngineMode mode;
|
||||
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
|
||||
index 7d49c03..d9eb3fe 100644
|
||||
index 3b62d1d..a5d1f7e 100644
|
||||
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
|
||||
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
|
||||
@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
|
||||
@@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
|
||||
funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
|
||||
|
||||
if (pex != 0) {
|
||||
|
|
@ -150,5 +150,5 @@ index 7d49c03..d9eb3fe 100644
|
|||
} else {
|
||||
m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 99c5a9d546a37e244bfc12b0aa134fccd31905b9 Mon Sep 17 00:00:00 2001
|
||||
From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||
Date: Mon, 27 May 2013 18:32:37 +0200
|
||||
Subject: [PATCH 14/23] enables tslib device to be read from env variable
|
||||
Subject: [PATCH 14/14] enables tslib device to be read from env variable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
|
@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644
|
|||
device = specification.toLocal8Bit();
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
1.8.5.2
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd"
|
||||
SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
|
||||
SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI += "file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch"
|
||||
|
||||
SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a"
|
||||
SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
require qt5-git.inc
|
||||
require ${BPN}.inc
|
||||
|
||||
SRCREV = "c21addb23f2eb67dc55853b115e5b735df065891"
|
||||
SRCREV = "3016e7fb6d5e00616fa75d2d2eeafa266382f953"
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
|
||||
Date: Wed, 5 Jun 2013 19:23:32 +0200
|
||||
Subject: [PATCH 3/3] Fix wrong calculation of viewPort for transitions
|
||||
|
||||
Viewport is calculated wrong for horizontal layout in a second instance
|
||||
|
||||
Task-number: QTBUG-29944
|
||||
Task-Number: QTBUG-31546
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Looks like backport of https://codereview.qt-project.org/49226 but this
|
||||
one was applied in previous patch, this change looks the same but is
|
||||
in different part of qquickitemview.cpp and ISN'T applied yet in dev
|
||||
branch.
|
||||
|
||||
Signed-off-by: Florian Haenel <florian.haenel@lge.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
|
||||
Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
|
||||
---
|
||||
src/quick/items/qquickitemview.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
|
||||
index a6dabee..290f283 100644
|
||||
--- a/src/quick/items/qquickitemview.cpp
|
||||
+++ b/src/quick/items/qquickitemview.cpp
|
||||
@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout()
|
||||
|
||||
prepareVisibleItemTransitions();
|
||||
|
||||
- QRectF viewBounds(0, position(), q->width(), q->height());
|
||||
+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height());
|
||||
for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin();
|
||||
it != releasePendingTransition.end(); ) {
|
||||
FxViewItem *item = *it;
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||
Date: Sun, 26 May 2013 14:26:19 +0200
|
||||
Subject: [PATCH 1/3] qmltestexample: fix link
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
else we get :
|
||||
ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
||||
---
|
||||
examples/qmltest/qmltest/qmltest.pro | 2 +-
|
||||
tools/qmltestrunner/qmltestrunner.pro | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
|
||||
index b5893c5..1b00e6c 100644
|
||||
--- a/examples/qmltest/qmltest/qmltest.pro
|
||||
+++ b/examples/qmltest/qmltest/qmltest.pro
|
||||
@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
|
||||
# This code exists solely for the purpose of building this example
|
||||
# inside the examples/ hierarchy.
|
||||
|
||||
-QT += qml qmltest
|
||||
+QT += qml qmltest quick
|
||||
|
||||
macx: CONFIG -= app_bundle
|
||||
|
||||
diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
|
||||
index 5184c1f..668cf17 100644
|
||||
--- a/tools/qmltestrunner/qmltestrunner.pro
|
||||
+++ b/tools/qmltestrunner/qmltestrunner.pro
|
||||
@@ -1,5 +1,5 @@
|
||||
SOURCES += main.cpp
|
||||
|
||||
-QT += qml qmltest
|
||||
+QT += qml qmltest quick
|
||||
|
||||
load(qt_tool)
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,3 +1,8 @@
|
|||
require qt5.inc
|
||||
|
||||
DEPENDS += "qtjsbackend qtsvg qtxmlpatterns"
|
||||
SRC_URI += " \
|
||||
file://0001-qmltestexample-fix-link.patch \
|
||||
file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "qtsvg qtxmlpatterns"
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-qmltestexample-fix-link.patch \
|
||||
file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "486fc16ad7b7d0c1488ba5482536d66c"
|
||||
SRC_URI[sha256sum] = "0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31"
|
||||
|
||||
# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png
|
||||
FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*.png \
|
||||
"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "0f7714c5c91b8eb7cdc1071f0a51c202"
|
||||
SRC_URI[sha256sum] = "b81bd480216fda8ff1d96610e710ff5ca17e0d711c8e40753264f91a4e8f6d19"
|
||||
|
|
@ -1,9 +1,4 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-qmltestexample-fix-link.patch \
|
||||
file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
|
||||
"
|
||||
|
||||
SRCREV = "672354676d8e968e2523d1aeb450213a46b8b27c"
|
||||
SRCREV = "f95fdacb3a12e4f0d37d3c32b34326f2bd1536de"
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "40d0989d68fb08c1184b7d5088da9c48"
|
||||
SRC_URI[sha256sum] = "347c33ee496d67d98d64b6fa43797c45eae85752bb0026eb234bfb420f77febf"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "85e94989bbc624f676102f0ea343b6dd"
|
||||
SRC_URI[sha256sum] = "b28cefa95578cf5ed1dfcbc81da1cbec427400e56edf0ce81323b3f25e2a558d"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRCREV = "94ba2a255c4ca7f07e024c9dedf5547f371fd3a2"
|
||||
SRCREV = "c640a496d63036ead177dd006ef56b9b12d962bb"
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "209edddd5899b36ea7ea7ad52204a593"
|
||||
SRC_URI[sha256sum] = "3bbb7825c0298c7d95d26b205e48da02c5bac3b35d66a601f939f8ee8b3463a4"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "fe9898272b3952e3d97eacbaca484b55"
|
||||
SRC_URI[sha256sum] = "632aacdac40717bf1bbc6861dc2e2d7d2825d68f40b7c1ae04636dafa20b0210"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRCREV = "a196fc62304ae23e68f60ae85a6106692f419f98"
|
||||
SRCREV = "d507c358b803cd40ec13ed19e00eced80b732571"
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From 973d4f0974c0b9c2504c56a2b9b8d6c709275ee4 Mon Sep 17 00:00:00 2001
|
||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Date: Tue, 4 Dec 2012 11:20:13 -0800
|
||||
Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
---
|
||||
src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||
index 16beb02..5e327f7 100644
|
||||
--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||
+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||
@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
|
||||
|
||||
# We don't need to install this tool, it's only used for building v8.
|
||||
# However we do have to make sure that 'make install' builds it.
|
||||
-dummytarget.CONFIG = dummy_install
|
||||
-INSTALLS += dummytarget
|
||||
+#dummytarget.CONFIG = dummy_install
|
||||
+#INSTALLS += dummytarget
|
||||
+
|
||||
+# Install the tool so that during target cross compilation we have access to the native side binary
|
||||
+target.path = $$[QT_HOST_BINS]
|
||||
+INSTALLS += target
|
||||
+
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From b0610cdb0c53be6da6d8f94be9af40bf50075368 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 28 Apr 2013 02:45:01 +0200
|
||||
Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/v8/v8.pro | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/v8/v8.pro b/src/v8/v8.pro
|
||||
index 2be6a19..d3da4e1 100644
|
||||
--- a/src/v8/v8.pro
|
||||
+++ b/src/v8/v8.pro
|
||||
@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
|
||||
include(v8.pri)
|
||||
|
||||
contains(QT_CONFIG, v8snapshot) {
|
||||
- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
|
||||
+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
|
||||
+ !exists($$mkv8snapshot.tool): \
|
||||
+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
|
||||
+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
|
||||
DUMMY_FILE = v8.pro
|
||||
mkv8snapshot.input = DUMMY_FILE
|
||||
mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 8ae71a0a3b898f95485148c9b2e89aeee9cf27e9 Mon Sep 17 00:00:00 2001
|
||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
Date: Tue, 4 Dec 2012 11:20:13 -0800
|
||||
Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||
---
|
||||
src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||
index 16beb02..5e327f7 100644
|
||||
--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||
+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||
@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
|
||||
|
||||
# We don't need to install this tool, it's only used for building v8.
|
||||
# However we do have to make sure that 'make install' builds it.
|
||||
-dummytarget.CONFIG = dummy_install
|
||||
-INSTALLS += dummytarget
|
||||
+#dummytarget.CONFIG = dummy_install
|
||||
+#INSTALLS += dummytarget
|
||||
+
|
||||
+# Install the tool so that during target cross compilation we have access to the native side binary
|
||||
+target.path = $$[QT_HOST_BINS]
|
||||
+INSTALLS += target
|
||||
+
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From c40e89b048e225cfb961ac65a96a30ce3ec624f5 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 28 Apr 2013 02:45:01 +0200
|
||||
Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/v8/v8.pro | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/v8/v8.pro b/src/v8/v8.pro
|
||||
index 2be6a19..d3da4e1 100644
|
||||
--- a/src/v8/v8.pro
|
||||
+++ b/src/v8/v8.pro
|
||||
@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
|
||||
include(v8.pri)
|
||||
|
||||
contains(QT_CONFIG, v8snapshot) {
|
||||
- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
|
||||
+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
|
||||
+ !exists($$mkv8snapshot.tool): \
|
||||
+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
|
||||
+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
|
||||
DUMMY_FILE = v8.pro
|
||||
mkv8snapshot.input = DUMMY_FILE
|
||||
mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git
|
||||
LICENSE = "LGPL-2.1 | GPL-3.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
|
||||
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
|
||||
"
|
||||
|
||||
DEPENDS = "qtbase-native"
|
||||
|
||||
QT_MODULE = "qtjsbackend"
|
||||
|
||||
require qt5-native.inc
|
||||
|
||||
SRC_URI += "\
|
||||
file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
|
||||
"
|
||||
|
||||
do_configure() {
|
||||
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install INSTALL_ROOT=${D}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f"
|
||||
SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
require qt5.inc
|
||||
|
||||
# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git
|
||||
LICENSE = "LGPL-2.1 | GPL-3.0"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
|
||||
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
|
||||
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
|
||||
"
|
||||
|
||||
DEPENDS += "qtbase qtjsbackend-native"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
|
||||
"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f"
|
||||
SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832"
|
||||
|
|
@ -1,10 +1,4 @@
|
|||
require qt5-git.inc
|
||||
require ${PN}.inc
|
||||
|
||||
# qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
|
||||
PV = "4.999+5.0.0-beta1+git${SRCPV}"
|
||||
|
||||
# drop when bumping SRCREV
|
||||
PR = "r1"
|
||||
|
||||
SRCREV = "f28408346243cf090326f4738fd838219c21e00f"
|
||||
SRCREV = "c4d3b333a1ec0de5ef1389569b9b65467453e382"
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "4b6e74bd7752bc241617f41539632bba"
|
||||
SRC_URI[sha256sum] = "df907a81c4ef15c9aec216c1f57aa72a7a7b274ea3cb3950f87fa1b04e369ebe"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require qt5-${PV}.inc
|
||||
require ${PN}.inc
|
||||
|
||||
SRC_URI[md5sum] = "2d0f9403f607f617bcc13d4814f41365"
|
||||
SRC_URI[sha256sum] = "dc37d21db1d4d8cdc2808ee24c7354643bc0b2ff71f9631bd8cfded388a4d9ac"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue