qt/qtdeclarative.git/tools/qmleasing/splineeditor.cpp, branch 5.15.17 Qt Declarative (Quick 2) Revert "Update commercial license headers" 2021-03-24T14:55:37+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2021-03-18T12:46:04+00:00 4bb06cfba94bcc9ddf30d968a227d00479d475b7 This reverts commit 7b1331c789df0ac12d7cf5aa5f8967b8651a4cfa. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I47eb004523bdb3beb16e9fd51e40da6f738f9f34 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> 
This reverts commit 7b1331c789df0ac12d7cf5aa5f8967b8651a4cfa.

Revert of commercial license headers is required for Qt 5.15.3
opensource release.

Task-number: QTBUG-91108
Change-Id: I47eb004523bdb3beb16e9fd51e40da6f738f9f34
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Update commercial license headers 2021-02-02T14:34:24+00:00 Tarja Sundqvist tarja.sundqvist@qt.io 2021-01-22T15:42:05+00:00 7b1331c789df0ac12d7cf5aa5f8967b8651a4cfa Updated header.COMM to the files in tqtc-qtdeclarative. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4161 Change-Id: Ic1d011aa01b1fe7242bcbbf72d5ab454d1015cf9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Updated header.COMM to the files in tqtc-qtdeclarative.
Examples, documentation files or tests are not updated.

The commercial license header may contain some
additional lines so that its line count equals with
the earlier license header. Reason for this is that
some autotests use hard coded line numbers and a
change in the line count causes failures in tests.

Task-number: QTQAINFRA-4161
Change-Id: Ic1d011aa01b1fe7242bcbbf72d5ab454d1015cf9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Add missing QPainterPath includes 2020-03-09T13:30:35+00:00 Ulf Hermann ulf.hermann@qt.io 2020-03-09T12:52:20+00:00 508a8baf850dbad59fc0578356d1a9327f27e911 Apparently QPainterPath was transitively included from some other header before. With current qtbase, it is not anymore and the old code fails to compile. Change-Id: I2de3cd72e3cd33a4537f8156298fc757182907fa Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> 
Apparently QPainterPath was transitively included from some other header
before. With current qtbase, it is not anymore and the old code fails to
compile.

Change-Id: I2de3cd72e3cd33a4537f8156298fc757182907fa
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Add missing QPainterPath includes 2020-03-09T11:56:57+00:00 Mitch Curtis mitch.curtis@qt.io 2020-03-09T10:12:20+00:00 e03a30ecec099e8b5dbe50ebde8d4bb56413eb81 .../qsgadaptationlayer_p.h(500): error C2079: 'QSGDistanceFieldGlyphCache::GlyphData::path' uses undefined class 'QPainterPath' .../splineeditor.cpp(168): error C2079: 'path' uses undefined class 'QPainterPath' Change-Id: I5f905aa31b24f71c65889047065ab43725fb6733 Reviewed-by: Andy Shaw <andy.shaw@qt.io> 
.../qsgadaptationlayer_p.h(500): error C2079:
'QSGDistanceFieldGlyphCache::GlyphData::path' uses undefined
class 'QPainterPath'

.../splineeditor.cpp(168): error C2079: 'path' uses undefined
class 'QPainterPath'

Change-Id: I5f905aa31b24f71c65889047065ab43725fb6733
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Use Qt::SplitBehavior in preference to QString::SplitBehavior 2020-03-02T14:58:47+00:00 Edward Welbourne edward.welbourne@qt.io 2020-02-25T15:10:40+00:00 744246b1129f6042c0264eb578a6e5c86e09f80a The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step cloaser to that goal. Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298 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 cloaser to that goal.

Change-Id: I3214ad6ccaca9dfd4a026589cabeb40cbf4a6298
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
QtDeclarative: replace deprecated functions 2019-02-13T16:34:34+00:00 Christian Ehrlicher ch.ehrlicher@gmx.de 2019-02-10T11:49:46+00:00 57604562db870f7b05d4349761d73e054dbe04c6 Replace the deprecated functions with it successors: - QFontMetrics::width() -> horizontalAdvance() - QLayout::setMargin() -> setContentsMargins() Change-Id: I2a2557cdb2eaec40e2c9955a0082372c582ec6b8 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> 
Replace the deprecated functions with it successors:
 - QFontMetrics::width() -> horizontalAdvance()
 - QLayout::setMargin() -> setContentsMargins()

Change-Id: I2a2557cdb2eaec40e2c9955a0082372c582ec6b8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
use nullptr consistently (clang-tidy) 2018-02-26T07:13:18+00:00 Shawn Rutledge shawn.rutledge@qt.io 2018-02-21T09:41:54+00:00 499ec43937e926e4f2fa57a9baa455fcb3862262 From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Run includemocs in qtdeclarative 2017-04-26T13:19:13+00:00 Thiago Macieira thiago.macieira@intel.com 2017-04-25T21:08:46+00:00 80dc036882e06763b5202a5966422ba79538a2eb Change-Id: I84e363d735b443cb9beefffd14b8c023a37aa489 Reviewed-by: Lars Knoll <lars.knoll@qt.io> 
Change-Id: I84e363d735b443cb9beefffd14b8c023a37aa489
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Merge remote-tracking branch 'origin/5.8' into dev 2016-12-14T18:01:23+00:00 Liang Qi liang.qi@qt.io 2016-12-14T18:01:23+00:00 0e80d28aa5892d6bbb4d0017b1bc9a33489f4176 Conflicts: src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp src/qml/qml/qqmlimport.cpp src/quick/items/context2d/qquickcontext2dtexture_p.h tools/qmleasing/splineeditor.h Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5 
Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
	src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
	src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
	src/qml/qml/qqmlimport.cpp
	src/quick/items/context2d/qquickcontext2dtexture_p.h
	tools/qmleasing/splineeditor.h

Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5
Get rid of most QT_NO_FOO usages 2016-11-29T10:10:27+00:00 Lars Knoll lars.knoll@qt.io 2016-11-16T13:22:36+00:00 e579076bb36e6594003b2ade7f3d062944ef6f47 Instead use QT_CONFIG(foo). This change actually detected a few mis-spelled macros and invalid usages. Change-Id: I06ac327098dd1a458e6bc379d637b8e2dac52f85 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Instead use QT_CONFIG(foo). This change actually detected a few
mis-spelled macros and invalid usages.

Change-Id: I06ac327098dd1a458e6bc379d637b8e2dac52f85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>