qt5-native: Getting rid of printf statements in qmake
They will cause the building of cmake-native to fail as it will parse the output of qmake -query and is not expecting to find the added lines in the output Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
This commit is contained in:
parent
9f04cb7bb6
commit
a812c654db
|
@ -14,13 +14,12 @@ diff --git a/qmake/option.cpp b/qmake/option.cpp
|
||||||
index 91c154a..a4f3a85 100644
|
index 91c154a..a4f3a85 100644
|
||||||
--- a/qmake/option.cpp
|
--- a/qmake/option.cpp
|
||||||
+++ b/qmake/option.cpp
|
+++ b/qmake/option.cpp
|
||||||
@@ -647,6 +647,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data)
|
@@ -647,6 +647,10 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data)
|
||||||
|
|
||||||
QString qt_libraryInfoFile()
|
QString qt_libraryInfoFile()
|
||||||
{
|
{
|
||||||
+ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
|
+ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
|
||||||
+ if (QFile::exists(qtconfig)) {
|
+ if (QFile::exists(qtconfig)) {
|
||||||
+ printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data());
|
|
||||||
+ return qtconfig;
|
+ return qtconfig;
|
||||||
+ }
|
+ }
|
||||||
if (!Option::globals->qmake_abslocation.isEmpty())
|
if (!Option::globals->qmake_abslocation.isEmpty())
|
||||||
|
|
|
@ -17,13 +17,12 @@ diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryin
|
||||||
index a756577..0c92e12 100644
|
index a756577..0c92e12 100644
|
||||||
--- a/src/corelib/global/qlibraryinfo.cpp
|
--- a/src/corelib/global/qlibraryinfo.cpp
|
||||||
+++ b/src/corelib/global/qlibraryinfo.cpp
|
+++ b/src/corelib/global/qlibraryinfo.cpp
|
||||||
@@ -164,6 +164,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
|
@@ -164,6 +164,9 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
+ if (!QFile::exists(qtconfig)) {
|
+ if (!QFile::exists(qtconfig)) {
|
||||||
+ qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
|
+ qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
|
||||||
+ printf("Using qt.conf from: %s\n", qtconfig.toLatin1().data());
|
|
||||||
+ }
|
+ }
|
||||||
if (QFile::exists(qtconfig))
|
if (QFile::exists(qtconfig))
|
||||||
return new QSettings(qtconfig, QSettings::IniFormat);
|
return new QSettings(qtconfig, QSettings::IniFormat);
|
||||||
|
|
Loading…
Reference in New Issue