diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-22 16:42:16 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-23 05:27:50 +0000 |
commit | f0a22bd78dcd07834dcede4f25587eb619c684ba (patch) | |
tree | aaa72483c190c81757604d095b0cfa65bcc449b4 /LICENSE.GPL2 | |
parent | fbddf745e9011abd2838b644cbc3258572721d95 (diff) |
pro2cmake: Fix regressions introduced by reformat change
Sympy uses eval() inside its code, and that can raise an
AttributeError exception, so we have to catch that.
This happened when converting qml.pro in qtdeclarative.
Also the formatting change removed the raising of an exception
when an unhandled function was encountered in handle_function_value,
which caused not returning any value in such a case.
Instead just return the whole expression string, without checking
if the function is in some whitelist.
Also encountered in qml.pro.
Amends 91634c3c9b8d4f68f0ebd2ac76a8b5b79e4b4c94.
Change-Id: I47b73af1de0180becb9ef4fb78a8c35a04928d34
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions