qtbase: Drop unused patch for setting qt.conf override support
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
95e49bf0f4
commit
5bd1456605
|
@ -5,7 +5,6 @@ SRC_URI += " \
|
||||||
file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
|
file://0002-qmake-is-already-built-in-qt5-tools-native.patch \
|
||||||
file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
|
file://0003-Allow-building-a-separate-qmake-for-the-target.patch \
|
||||||
"
|
"
|
||||||
#file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
|
|
||||||
|
|
||||||
# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h
|
# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h
|
||||||
DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms"
|
DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms"
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
From d5a0cf45ebbd6a5911f8bd208fe355eb990b5388 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Holger Freyther <zecke@selfish.org>
|
|
||||||
Date: Wed, 26 Sep 2012 17:22:30 +0200
|
|
||||||
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 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 files changed, 5 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
index ccf0718..497e72e 100644
|
|
||||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
@@ -49,6 +49,8 @@
|
|
||||||
QT_BEGIN_NAMESPACE
|
|
||||||
extern QString qt_libraryInfoFile();
|
|
||||||
QT_END_NAMESPACE
|
|
||||||
+#include <stdlib.h>
|
|
||||||
+#include <stdio.h>
|
|
||||||
#elif defined(QT_BOOTSTRAPPED)
|
|
||||||
QString qt_libraryInfoFile()
|
|
||||||
{
|
|
||||||
@@ -142,6 +143,11 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
|
|
||||||
#ifdef QT_BOOTSTRAPPED
|
|
||||||
if(!QFile::exists(qtconfig))
|
|
||||||
qtconfig = qt_libraryInfoFile();
|
|
||||||
+ if (!QFile::exists(qtconfig)) {
|
|
||||||
+ QByteArray config = getenv("QT_CONF_PATH");
|
|
||||||
+ qtconfig = QFile::decodeName(config);
|
|
||||||
+ printf("using qt.conf %s", qtconfig.toLatin1().data());
|
|
||||||
+ }
|
|
||||||
#else
|
|
||||||
if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
|
|
||||||
#ifdef Q_OS_MAC
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
||||||
|
|
Loading…
Reference in New Issue