qt/qtdeclarative.git/src/quick/items/qquickpainteditem.cpp, branch wip/cmake Qt Declarative (Quick 2) Quick: Don't qualify OpenGL includes (part two) 2020-02-18T08:51:27+00:00 Johan Klokkhammer Helsing johan.helsing@qt.io 2020-02-03T14:02:31+00:00 872dc18e653b50c878699a78ca7cb9399cb47b62 406f15ce0e only removed the "QtGui" prefix from some includes, but we are trying to move (almost) everything OpenGL related from QtGui. This removes prefixes for additional QOpenGL includes (QOpenGLShaderProgram, versioned opengl functions etc.). Task-number: QTBUG-74409 Change-Id: I91e1feac0676859f11de9b75301a0a4e81db50d9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
406f15ce0e only removed the "QtGui" prefix from some includes, but we are
trying to move (almost) everything OpenGL related from QtGui.

This removes prefixes for additional QOpenGL includes (QOpenGLShaderProgram,
versioned opengl functions etc.).

Task-number: QTBUG-74409
Change-Id: I91e1feac0676859f11de9b75301a0a4e81db50d9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge remote-tracking branch 'origin/5.15' into dev 2019-12-12T09:06:06+00:00 Qt Forward Merge Bot qt_forward_merge_bot@qt-project.org 2019-12-12T00:00:07+00:00 1196b1ef6c5d2cb05ceba5d6f178dc7e2432ed61 Conflicts: src/qml/types/qqmlbind.cpp Change-Id: Ib992d1a7ac6c1a96d39819be6f23955dc31b44b2 
 Conflicts:
	src/qml/types/qqmlbind.cpp

Change-Id: Ib992d1a7ac6c1a96d39819be6f23955dc31b44b2
Avoid initializing QFlags with 0 or nullptr in further cases 2019-11-25T12:35:32+00:00 Friedemann Kleint Friedemann.Kleint@qt.io 2019-11-25T10:49:14+00:00 c0a8c84eb4bfa8be5fc77d44d25c1a523c022d5c Amends 744e77b841878fb017c0f2d60607090008f28180. Change-Id: I16e37aaf503eb62f67fca0e48be4c92c4a72ae46 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> 
Amends 744e77b841878fb017c0f2d60607090008f28180.

Change-Id: I16e37aaf503eb62f67fca0e48be4c92c4a72ae46
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Fix Qt6 build 2019-07-31T17:07:59+00:00 Alexandru Croitor alexandru.croitor@qt.io 2019-07-31T16:33:20+00:00 ebd287fd035dda9d4fea9b73d0ae5af2b2e16e06 Amends 013a1ae4e7e5df36e03ccf71f02ad6644473a3e8 Change-Id: I4b8ed9cf80f8715424346fd4b81fb4bc5e54bfbc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
Amends 013a1ae4e7e5df36e03ccf71f02ad6644473a3e8

Change-Id: I4b8ed9cf80f8715424346fd4b81fb4bc5e54bfbc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
doc: Fix some odds and ends in qdoc comments 2018-02-28T10:32:26+00:00 Martin Smith martin.smith@qt.io 2018-02-27T12:58:37+00:00 a9b8541c01e1ea9ed6e136108c4195fe2f00c507 A few incorrent link commands were fixed. A few "No such parameter..." errors were fixed. A \qmlproperty return type qwas adjusted. A comment was removed from between a qdoc coment and its function definition. And a missing \reimp comment was added. Change-Id: I79c0882d730c77a179a4daf98bc6a46916c585d5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io> 
A few incorrent link commands were fixed. A few "No such parameter..."
errors were fixed. A \qmlproperty return type qwas adjusted. A comment
was removed from between a qdoc coment and its function definition. And
a missing \reimp comment was added.

Change-Id: I79c0882d730c77a179a4daf98bc6a46916c585d5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Martin Smith <martin.smith@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>
Merge remote-tracking branch 'origin/5.8' into dev 2016-10-18T06:33:26+00:00 Liang Qi liang.qi@qt.io 2016-10-18T06:33:26+00:00 f04c2c40fd7ee91e5cbff2ca4df0fdc30dfbbcd5 Conflicts: src/qml/jsruntime/qv4variantobject.cpp src/qml/types/qquickworkerscript.cpp src/quick/scenegraph/util/qsgdefaultpainternode_p.h tools/qmljs/qmljs.cpp Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59 
Conflicts:
	src/qml/jsruntime/qv4variantobject.cpp
	src/qml/types/qquickworkerscript.cpp
	src/quick/scenegraph/util/qsgdefaultpainternode_p.h
	tools/qmljs/qmljs.cpp

Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59