delta/qt5/qtscript.git/src/scripttools, branch dev code.qt.io: qt/qtscript.git Merge remote-tracking branch 'origin/5.15' into dev 2020-03-03T02:03:06+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2020-03-03T02:03:06+00:00 f308e917cb0ce05c8c7801299471d68d2344d81c Change-Id: I37ffab5c5cf7c0898e1fa2b291cb7d95120fa25e 
Change-Id: I37ffab5c5cf7c0898e1fa2b291cb7d95120fa25e
Use Qt::SplitBehavior in preference to QString::SplitBehavior 2020-03-02T14:57:47+00:00 Edward Welbourne edward.welbourne@qt.io 2020-02-25T14:31:24+00:00 36300dd06bb8191800ec93ca5a408f39b1f221eb The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I10d928ac4368e07a52a92ef92bf501ba28d9b667 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: I10d928ac4368e07a52a92ef92bf501ba28d9b667
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2019-11-30T02:06:26+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-11-30T02:06:26+00:00 5571928b379f71ccfa78e961755d24b4fdff1ab9 Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5 
Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
Avoid initializing QFlags with 0 or nullptr 2019-11-26T07:02:32+00:00 Friedemann Kleint Friedemann.Kleint@qt.io 2019-11-25T14:15:53+00:00 ee32a6b5a0ba187606b9ad3cdfcf73cbbc1ce02f It is being deprecated. Change-Id: I772c028967f3c986674081992f569bd7bbba81a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> 
It is being deprecated.

Change-Id: I772c028967f3c986674081992f569bd7bbba81a5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2019-10-19T01:01:02+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-10-19T01:01:02+00:00 143daeb58f1958362e12004fdb4a4d0f66c98b61 Change-Id: Ie112fce6a13098f0baee5f06d4dbeafb0daca2e1 
Change-Id: Ie112fce6a13098f0baee5f06d4dbeafb0daca2e1
Merge remote-tracking branch 'origin/5.13' into 5.14 2019-10-12T01:03:17+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-10-12T01:03:17+00:00 5e3ddf5f53836640573f46078779790256409f6d Change-Id: Ib3471490e7ddb8d7adaf81245d45cd1f8ec178f0 
Change-Id: Ib3471490e7ddb8d7adaf81245d45cd1f8ec178f0
Fix build with -no-feature-tooltip 2019-10-09T12:04:29+00:00 Joerg Bornemann joerg.bornemann@qt.io 2019-10-09T07:55:52+00:00 16d347e4b31cc6a59d920d91b877f0b721c12a0b Task-number: QTBUG-79048 Change-Id: I287c580785b8b22c877e7a6b885402fbe1bff249 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> 
Task-number: QTBUG-79048
Change-Id: I287c580785b8b22c877e7a6b885402fbe1bff249
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Merge remote-tracking branch 'origin/wip/qt6' into dev 2019-10-04T12:19:43+00:00 Simon Hausmann simon.hausmann@qt.io 2019-10-04T12:19:43+00:00 1af75e36c4690ea27d71edec1964ee0173e04fb3 Conflicts: .qmake.conf Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036 
 Conflicts:
	.qmake.conf

Change-Id: I5568b3f8f2834f30e3ffa43f50c2f47ac9b66036
Remove usages of deprecated APIs 2019-08-23T15:18:10+00:00 Sona Kurazyan sona.kurazyan@qt.io 2019-07-03T12:50:28+00:00 1de1f080ef4b37576843bd59a8aa3e484c918820 Replaced: QLayout::setMargin -> QLayout::setContentsMargins Qt::ItemDataRole::TextColorRole -> Qt::ItemDataRole::ForegroundRole Change-Id: I3bae804d593835f1bc96a8c654fcfa77106bc91c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> 
Replaced:
 QLayout::setMargin -> QLayout::setContentsMargins
 Qt::ItemDataRole::TextColorRole -> Qt::ItemDataRole::ForegroundRole

Change-Id: I3bae804d593835f1bc96a8c654fcfa77106bc91c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Merge remote-tracking branch 'origin/5.13' into dev 2019-07-11T13:05:44+00:00 Edward Welbourne edward.welbourne@qt.io 2019-07-11T13:01:32+00:00 60fdcf74e84e23b5bddd1718fcf90bec976ef544 Conflicts: .qmake.conf Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4 
Conflicts:
	.qmake.conf

Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4