From 8f82ee1c04cebd2825925a7be71f5f9523a1779b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 17 Dec 2015 16:27:23 +0100 Subject: report cumulativity of $$system() and evaluator error output as well so far, we "downgraded" only explicit error() output, but other errors may happen as well while doing semi-exact evaluation of .prf files - at least hypothetically. amends 08d0cb6f8e. Change-Id: I32819a569dbed2dbdb37c5c23bf4a5a18d3c64ea Reviewed-by: Joerg Bornemann (cherry picked from qttools/ea1a5c3534f089c0e704808a0fb029eda8f753b4) Reviewed-by: Jake Petroules --- qmake/library/qmakebuiltins.cpp | 4 +++- qmake/library/qmakeevaluator.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index 9fc6603075..8f3849e6d8 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -406,7 +406,9 @@ QByteArray QMakeEvaluator::getCommandOutput(const QString &args) const if (!errout.isEmpty()) { if (errout.endsWith('\n')) errout.chop(1); - m_handler->message(QMakeHandler::EvalError, QString::fromLocal8Bit(errout)); + m_handler->message( + QMakeHandler::EvalError | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), + QString::fromLocal8Bit(errout)); } # endif out = proc.readAllStandardOutput(); diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 48bd17e789..cd5676093d 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -2034,7 +2034,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFileInto( void QMakeEvaluator::message(int type, const QString &msg) const { if (!m_skipLevel) - m_handler->message(type, msg, + m_handler->message(type | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0), msg, m_current.line ? m_current.pro->fileName() : QString(), m_current.line != 0xffff ? m_current.line : -1); } -- cgit v1.2.3 From 85d7c732e9b84a9afdb040d01e7bb7166f605abe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Sep 2016 13:38:29 +0200 Subject: fix warning in qmakevfs without PROEVALUATOR_FULL amends 57ca8d2698. Change-Id: Ibf56c15ab46b9dfa856dc0af7ae2e8c84caa3063 Reviewed-by: Jake Petroules --- qmake/library/qmakevfs.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'qmake') diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp index d23d1f06ff..daafe130a1 100644 --- a/qmake/library/qmakevfs.cpp +++ b/qmake/library/qmakevfs.cpp @@ -65,6 +65,7 @@ bool QMakeVfs::writeFile(const QString &fn, QIODevice::OpenMode mode, bool exe, else *cont = contents; Q_UNUSED(errStr) + Q_UNUSED(exe) return true; #else QFileInfo qfi(fn); -- cgit v1.2.3 From 669add92d9adc15ecfa0b2d62dd90ea9066d401e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 3 Oct 2016 19:34:21 +0200 Subject: Replace QCFString::to(CF/NS/Q)String usage with QString methods Slims down QCFString and leaves only one implementation of converting back and forth between CF/NS strings and QStrings. Change-Id: I068568ffa25e6f4f6d6c99dcf47078b7a8e70e10 Reviewed-by: Jake Petroules --- qmake/generators/mac/pbuilder_pbx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 85a5ba56c3..dce22ed712 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1863,7 +1863,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const CFStringRef str = CFStringRef(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"))); if (str) { - QStringList versions = QCFString::toQString(str).split(QLatin1Char('.')); + QStringList versions = QString::fromCFString(str).split(QLatin1Char('.')); int versionMajor = versions.at(0).toInt(); int versionMinor = versions.at(1).toInt(); if (versionMajor >= 3) { -- cgit v1.2.3 From 1df4b2a3609d977cc8123f1f82e454d0333287d4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 7 Oct 2016 11:11:24 +0200 Subject: fix build with QT_NO_CAST_FROM_ASCII necessary for use outside qmake itself. amends f137957e08. Change-Id: Ie069f7b6efc969ab112e1f0ecd966eb06248fb94 Reviewed-by: Maurice Kalinowski --- qmake/library/proitems.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index a3d2c01760..05d9e8da28 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -208,9 +208,9 @@ inline QString operator+(const QString &one, const ProString &two) { return ProString(one) + two; } inline QString operator+(const ProString &one, const char *two) - { QString ret = one.toQStringRef() + two; ret.detach(); return ret; } + { QString ret = one.toQStringRef() + QLatin1String(two); ret.detach(); return ret; } inline QString operator+(const char *one, const ProString &two) - { QString ret = one + two.toQStringRef(); ret.detach(); return ret; } + { QString ret = QLatin1String(one) + two.toQStringRef(); ret.detach(); return ret; } inline QString operator+(const ProString &one, QChar two) { return one.toQStringRef() + two; } inline QString operator+(QChar one, const ProString &two) -- cgit v1.2.3 From 267dd9133d76d466c0f940e7286dc9ba03bac18e Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 16 Sep 2016 14:37:16 +0200 Subject: Clean up building of bootstrap lib and tools Add a qconfig-bootstrap.h, which contains all the defines required to build the bootstrapped tools. This will be required anyway when moving more code over to use QT_CONFIG(foo) instead of QT_NO_FOO. Change-Id: I783d0aa0100b9190fe2d422bee4a95b05720aebe Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- qmake/Makefile.unix | 9 +++------ qmake/Makefile.win32 | 7 ++----- qmake/qmake.pri | 6 +----- 3 files changed, 6 insertions(+), 16 deletions(-) (limited to 'qmake') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index ffbd0d4545..320979150f 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -99,15 +99,12 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ -I$(INC_PATH) -I$(INC_PATH)/QtCore \ -I$(INC_PATH)/QtCore/$(QT_VERSION) -I$(INC_PATH)/QtCore/$(QT_VERSION)/QtCore \ - -I$(BUILD_PATH)/src/corelib/global -DHAVE_QCONFIG_CPP \ + -I$(BUILD_PATH)/src/corelib/global \ -I$(QMAKESPEC) \ -I$(SOURCE_PATH)/tools/shared \ -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ - -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ - -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_NO_FOREACH \ - -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS + -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ + -DQT_NO_FOREACH CXXFLAGS = $(EXTRA_CXXFLAGS) $(CPPFLAGS) diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index fc225ff098..5db8b04aa0 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -40,15 +40,12 @@ CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ $(CFLAGS_EXTRA) \ -I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac -I$(QMKSRC)\generators\integrity \ -I$(INC_PATH) -I$(INC_PATH)\QtCore -I$(INC_PATH)\QtCore\$(QT_VERSION) -I$(INC_PATH)\QtCore\$(QT_VERSION)\QtCore \ - -I$(BUILD_PATH)\src\corelib\global -DHAVE_QCONFIG_CPP \ + -I$(BUILD_PATH)\src\corelib\global \ -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ -I$(SOURCE_PATH)\tools\shared \ -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS \ - -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ - -DQT_NO_FOREACH \ - -DUNICODE -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 -DQT_JSON_READONLY -DQT_NO_STANDARDPATHS + -DQT_NO_FOREACH -DUNICODE CFLAGS = $(CFLAGS_PCH) $(CFLAGS_BARE) $(CFLAGS) CXXFLAGS_BARE = $(CFLAGS_BARE) diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 7f49bb9adb..288d99d8a2 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -151,11 +151,7 @@ bootstrap { #Qt code LFLAGS += -lcpp } - DEFINES += \ - QT_BOOTSTRAPPED \ - QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_COMPONENT QT_NO_COMPRESS \ - QT_NO_THREAD QT_NO_QOBJECT QT_NO_GEOM_VARIANT QT_NO_DATASTREAM \ - QT_CRYPTOGRAPHICHASH_ONLY_SHA1 QT_JSON_READONLY QT_NO_STANDARDPATHS + DEFINES += QT_BOOTSTRAPPED INCLUDEPATH += \ $$QT.core.includes $$QT.core_private.includes \ -- cgit v1.2.3