From 5db85796206666bea8c47ea1a0c1cdb2fa863ffc Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 9 Mar 2021 16:32:02 +0100 Subject: Add support for various output formats for QMakeProperty Add the ability to select a standard and json output formats of the Qt properties. This patch also improves the encapsulation of QMakeProperty. Change-Id: Ib1d232be1b430ed8456ce65cc98141282e4c3f7f Reviewed-by: Alexandru Croitor --- qmake/main.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'qmake/main.cpp') diff --git a/qmake/main.cpp b/qmake/main.cpp index 3180d5c826..b00d110827 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -508,10 +508,18 @@ int runQMake(int argc, char **argv) } QMakeProperty prop; - if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY || - Option::qmake_mode == Option::QMAKE_SET_PROPERTY || - Option::qmake_mode == Option::QMAKE_UNSET_PROPERTY) - return prop.exec() ? 0 : 101; + switch (Option::qmake_mode) { + case Option::QMAKE_QUERY_PROPERTY: + return prop.queryProperty(Option::prop::properties); + case Option::QMAKE_SET_PROPERTY: + return prop.setProperty(Option::prop::properties); + case Option::QMAKE_UNSET_PROPERTY: + prop.unsetProperty(Option::prop::properties); + return 0; + default: + break; + } + globals.setQMakeProperty(&prop); ProFileCache proFileCache; -- cgit v1.2.3