qt/qtdeclarative.git/src/qml/jsruntime, branch wip/cmake Qt Declarative (Quick 2) Adapt to the the new QMetaType change 2020-03-09T09:54:37+00:00 Olivier Goffart ogoffart@woboq.com 2020-01-07T10:37:01+00:00 f3dccc334f01d088fcdf1c2016c8153fe6154b61 Fixes: QTBUG-82453 Change-Id: I7e5682945a07c3af183becd3947a69568f139d16 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Fixes: QTBUG-82453
Change-Id: I7e5682945a07c3af183becd3947a69568f139d16
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2020-03-09T08:58:49+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-09T00:00:06+00:00 d51d5ff3c187821929cf7b765e037423bcc90466 Conflicts: src/qml/compiler/qqmlirbuilder_p.h src/qml/qml/qqmlpropertycachecreator_p.h src/qmltyperegistrar/qmltypesclassdescription.cpp src/qmltyperegistrar/qmltypesclassdescription.h src/qmltyperegistrar/qmltypescreator.cpp src/quick/items/qquicktext_p.h src/quick/util/qquickvaluetypes_p.h Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5 
 Conflicts:
	src/qml/compiler/qqmlirbuilder_p.h
	src/qml/qml/qqmlpropertycachecreator_p.h
	src/qmltyperegistrar/qmltypesclassdescription.cpp
	src/qmltyperegistrar/qmltypesclassdescription.h
	src/qmltyperegistrar/qmltypescreator.cpp
	src/quick/items/qquicktext_p.h
	src/quick/util/qquickvaluetypes_p.h

Change-Id: Ic209741592e7b85820bf3845722023a190ebc1c5
Merge remote-tracking branch 'origin/5.14' into 5.15 2020-03-03T11:23:20+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-03T00:00:05+00:00 04e3918f0fd0c19ed830d406e1c549a037089cc4 Conflicts: src/qmlmodels/qqmltableinstancemodel.cpp src/qmlmodels/qqmltableinstancemodel_p.h Change-Id: I89339b1cb41ba27fe30c79530859a1c2bfbecc69 
 Conflicts:
	src/qmlmodels/qqmltableinstancemodel.cpp
	src/qmlmodels/qqmltableinstancemodel_p.h

Change-Id: I89339b1cb41ba27fe30c79530859a1c2bfbecc69
Restore offset/length in QQmlJS::DiagnosticMessage 2020-03-02T09:35:50+00:00 Simon Hausmann simon.hausmann@qt.io 2020-02-27T09:49:14+00:00 8ab237edf170f5b0482dccf5169868e5c7c47771 This is needed in a few places outside of declarative, so this change restores the loc member in DiagnosticMessage and moves QQmlJS::AST::SourceLocation into common's QQmlJS namespace/directory. QQmlError is unaffected and retains only line/column. Amends d4d197d06279f9257647628f7e1ccc9ec763a6bb Change-Id: Ifb9d344228e3c6e9e26fc4fe112686f9336ea2b2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
This is needed in a few places outside of declarative, so this change
restores the loc member in DiagnosticMessage and moves
QQmlJS::AST::SourceLocation into common's QQmlJS namespace/directory.
QQmlError is unaffected and retains only line/column.

Amends d4d197d06279f9257647628f7e1ccc9ec763a6bb

Change-Id: Ifb9d344228e3c6e9e26fc4fe112686f9336ea2b2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Revert "error -> networkError to fix deprecation warning" 2020-02-28T12:46:44+00:00 Timur Pocheptsov timur.pocheptsov@qt.io 2020-02-28T11:15:01+00:00 e0bbea53f92648e004b162428e36dcdd8cf95cf1 This reverts commit 391bd68b4045268b389780f4b08d2f07951b45bf. Reason for revert: this warning is only temporary, the patch fixing it - is coming. But the original change of error->networkError was reverted in 5.15 to make the new patch, changing signal name instead, work. Now qtdeclarative does not compile - it calls non-existing function. Change-Id: I276562564c8954f67dcdf4fd5d08afd5f3f9dc8b Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
This reverts commit 391bd68b4045268b389780f4b08d2f07951b45bf.

Reason for revert: this warning is only temporary, the patch fixing it
- is  coming. But the original change of error->networkError
was reverted in 5.15 to make the new patch, changing signal name instead,
work. Now qtdeclarative does not compile - it calls non-existing function.

Change-Id: I276562564c8954f67dcdf4fd5d08afd5f3f9dc8b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
error -> networkError to fix deprecation warning 2020-02-27T16:37:11+00:00 Fawzi Mohamed fawzi.mohamed@qt.io 2020-02-27T11:05:32+00:00 391bd68b4045268b389780f4b08d2f07951b45bf Change-Id: I80d518a1b21185baba0d4934ebf486809e086f9f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Change-Id: I80d518a1b21185baba0d4934ebf486809e086f9f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
V4: Fix mark stack overruns 2020-02-27T14:08:29+00:00 Ulf Hermann ulf.hermann@qt.io 2020-02-17T14:30:54+00:00 2b5e0f90112fe85872894fb16e811203d4d3671f Instead of applying a heuristic on when to call drain() in unrelated code, we check the stack limit on each push(). If the soft limit is reached we try to drain. As drain() itself can push again, we try to limit the stack size by allowing at most 65 recursions of drain(). If none of that helps, we crash with a meaningful error message. This allows us to remove all the hacky drain() calls in other parts of the code. Change-Id: Ib979339470da0e85981de8131e7997755b757c71 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Instead of applying a heuristic on when to call drain() in unrelated
code, we check the stack limit on each push(). If the soft limit is
reached we try to drain. As drain() itself can push again, we try to
limit the stack size by allowing at most 65 recursions of drain(). If
none of that helps, we crash with a meaningful error message.

This allows us to remove all the hacky drain() calls in other parts of
the code.

Change-Id: Ib979339470da0e85981de8131e7997755b757c71
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Revert "Replace call to deprecated QNetworkReply::error method" 2020-02-24T17:47:39+00:00 Timur Pocheptsov timur.pocheptsov@qt.io 2020-02-24T17:26:41+00:00 8dcd51b63d26fcac466d80dc90942ae2cf3b4f4e This reverts commit e5a4ba4a5573ace08def218b985dde83de0805fb. Reason for revert: it was decided to re-name a signal instead, like it's done in QProcess. Change-Id: I0f393c482d8be506430258d7afd4a0056611831f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> 
This reverts commit e5a4ba4a5573ace08def218b985dde83de0805fb.

Reason for revert: it was decided to re-name a signal instead, like it's done in QProcess.

Change-Id: I0f393c482d8be506430258d7afd4a0056611831f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Fix build with -no-feature-network 2020-02-24T09:27:26+00:00 Ulf Hermann ulf.hermann@qt.io 2020-02-24T08:41:22+00:00 deb74c609e066b0efd73d1adbc6077e6ca7d8c45 Fixes: QTBUG-82418 Change-Id: Ibceeefed75941d963e6b79b44e9231d0d8053221 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Fixes: QTBUG-82418
Change-Id: Ibceeefed75941d963e6b79b44e9231d0d8053221
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2020-02-21T08:00:37+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-02-21T00:00:10+00:00 f6808f89a8c17e046f53b0bb5ff36cd9e24e9772 Conflicts: tests/auto/quick/qquickmousearea/BLACKLIST Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c 
 Conflicts:
	tests/auto/quick/qquickmousearea/BLACKLIST

Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c