Commit Graph

43 Commits

Author SHA1 Message Date
Eirik Aavitsland 539d724890 Doc: Describe new 5.11 features in Image element
Add user documentation of the compressed texture file support and the
file extension auto detection.

Change-Id: Icfae8574dd3acba30e8275ccd6ff3438fa037868
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2018-04-13 13:17:23 +00:00
Shawn Rutledge 499ec43937 use nullptr consistently (clang-tidy)
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>
2018-02-26 07:13:18 +00:00
Laszlo Agocs 9b480bade6 Rename shape example files to get rid of the old pathitem term
QQuickShape used to be known as QQuickPathItem. Avoid the old
name in publicly exposed components.

Change-Id: I70bed142e1e82c48c496ab98384318e08fba99c7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-09 09:07:50 +00:00
Laszlo Agocs 961da5273e Rename to Shape/ShapePath and remove public JS API
Change-Id: I299354da0632fb0b8487cfb13748ed58b97d75fd
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2017-06-02 10:16:52 +00:00
Laszlo Agocs 0eeb7ada04 Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I0cbb2ba4a00580e6a74a4e4085fc4eb06d0fadae
2017-04-03 13:35:30 +02:00
Laszlo Agocs 4cddb73882 Add a PathItem autotest for the declarative API
Change-Id: I276c185c93122e5eb05ef6678ab62fa6928f2523
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2017-03-30 09:29:19 +00:00
Liang Qi 435774ced1 Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
	src/qml/qml/qqmlimport.cpp

Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a
2017-03-13 07:29:03 +01:00
Ulf Hermann 408620ea99 Fix building with -no-feature-process
Drop an unused include, don't try to build qmlplugindump in this
case, and add some guards around QProcess includes and usages.

Change-Id: I6ce5985a8dd1967f146016a7acd1ea31fb3bda2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-02 11:43:49 +00:00
Laszlo Agocs 03fe99ba3a Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea
2017-01-23 12:36:29 +01:00
Robin Burchell 2c826af7c3 tests: Remove some vestigial references
qtdeclarative hasn't relied on qtwebkit for a long time (since
fbfb27a44a &
56d34a653a as early as 2011!).

Change-Id: If02572617034bf2c3eecbf081b96b1ed0ad65b45
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-16 15:13:54 +00:00
Laszlo Agocs c9023c2876 Add QQuickPathItem and its backend infra
The generic backend uses the triangulator from QtGui, but is in
fact OpenGL-only for now due to materials.

The NVPR backend uses GL_NV_path_rendering on NVIDIA hardware with
OpenGL 4.3+ or OpenGL ES 3.1+.

The software backend simply uses QPainter.

With the generic backend each PathItem is backed by a non-visual root node
and 0, 1 or 2 child geometry nodes, depending on the presence of visible
stroking and filling. The potentially expensive triangulation happens on
updatePolish(), on the gui thread. This is proven to provide much smoother
results when compared to doing the geometry generation on the render thread
in updatePaintNode(), in particular on power-limited embedded devices.

The NVPR backend uses a QSGRenderNode in DepthAware mode so that the batch
renderer can continue to rely on the depth buffer and use opaque batches.
Due to not relying on slow CPU-side triangulation, this backend uses 5-10
times less CPU, even when properties of the path or its elements are
animated.

The path itself is specified with the PathView's Path, PathLine, PathArc,
PathQuad, etc. types. This allows for consistency with PathView and the
2D Canvas and avoids a naming mess in the API. However, there won't be a
100% symmetry: backends like NVPR will not rely on QPainterPath but process
the path elements on their own (as QPainterPath is essentially useless with
these APIs), which can lead to differences in the supported path elements.

The supported common set is currently Move, Line, Quad, Cubic, Arc.

The patch introduces PathMove, which is essentially PathLine but maps to
moveTo instead of lineTo. More types may get added later (e.g. NVPR can do
a wide variety of optimized rounded rects, but this requires directly
specifying a GL_ROUNDED_RECTx_NV command, thus neededing a dedicated Path
type on our side too)

For filling with gradients only linear gradients are supported at the
moment.

In addition to the declarative API, a more lightweight, QObject-less
JS-callable API should be considered as well for the future.

Change-Id: I335ad64b425ee279505d60e3e57ac6841e1cbd24
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2016-12-19 17:03:46 +00:00
Lars Knoll e579076bb3 Get rid of most QT_NO_FOO usages
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>
2016-11-29 10:10:27 +00:00
Laszlo Agocs 0837453ef9 Merge remote-tracking branch 'origin/dev' into HEAD
Change-Id: If91e0e28d004f1db978dcab393f189743bb69cd5
2016-05-24 21:50:29 +02:00
Liang Qi 63ec33e79c Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4engine_p.h

Change-Id: I89ffccd699bee675732758d039e22224b275d60d
2016-05-19 20:41:34 +02:00
Oswald Buddenhagen 61c8539e2a blacklist the qmlextensionplugins example for testing
it requires a special import search path. it would be possible to hack
this into the test launcher, but that doesn't seem worth it (there are
other plugin examples already).

Change-Id: I147b802c690933803cb8f9cf35210618957a6998
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-13 04:35:45 +00:00
Oswald Buddenhagen 83d3611199 remove blacklisting of tiger and fonts examples
the associated bugs are marked as fixed for a long time.

Change-Id: If8c8710bdf4b7b1962c9749b701cbd335d938fdb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-13 04:35:40 +00:00
Oswald Buddenhagen 3cdf72a7b5 adjust example naming convention test to "new" structure
Change-Id: I42ec26bd3c2ffa32ae8c5323f7c0a0343d12ce2f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-13 04:35:37 +00:00
Andy Nichols 928915cabe Fix some test failures with QT_NO_OPENGL builds
Change-Id: I4154084b4a0e0709ee8cb39a856a37a611e2d537
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2016-05-06 19:17:28 +00:00
Jan Arve Saether 974643829f Move QtQuick.Layouts to qtdeclarative from qtquickcontrols
This is in order for it to be available without having to install
Qt Quick Controls

Change-Id: I3f0d0dc108829947cd189b7861944e556e00cef3
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-26 13:18:27 +00:00
Jani Heikkinen 38ec3bd755 Updated license headers
From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/

Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)

Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-20 11:46:25 +00:00
Sune Vuorela 71c357e416 Let unit tests pass if xmlpatterns is not around
The blacklist for xmlpatterns tests is not applied unless xmlpatterns
specifically has been disabled, but code builds anyways.

Fix up the blacklist.

Change-Id: I013701e787e8ec28f1282a911270dd7a158d6f01
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-07-16 19:53:03 +00:00
Jani Heikkinen c5796292ad Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-02-12 10:28:11 +00:00
Jani Heikkinen e7ceacda70 Update license headers and add new licenses
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-25 11:28:46 +02:00
Shawn Rutledge 9f661cf327 photosurface demo: behavior depends on initialization order
The file dialog wasn't appearing on the mac.  This way seems to work.
We have a long-term bug here but this workaround will look better for
the release.

Change-Id: I8538ca5dc11a063591bc4557fd3779c5bb3768b5
Task-number: QTBUG-31699
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-06-14 14:20:52 +02:00
Gunnar Sletta ebe8b9408c Complete rewrite of threaded render loop.
This change starts using the superior implementation of the scene graph
render loop which has been worked on in the scenegraph-playground
project for a while. It uses a far more straightforward locking/sync
paradigm compared to the existing one and is less deadlock and error
prone. It also enables the scene graph thread to run on its own when
the GUI thread is blocked, enabling threaded animations.

This changes also introduces a naming change inside Qt Quick from
"Window Manager" -> "Render Loop" as that fits better to what the
code does.

Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-01-18 12:26:55 +01:00
Sergio Ahumada 83deab8d1b Update copyright year in Digia's license headers
Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-10 19:52:37 +01:00
Alan Alpert acb9a7340b Resume testing of customparticle
Tests were suspended pending a fix for QTBUG-24034, which was fixed
months ago.

Change-Id: I903addc8cb1206073e8e1e1532dbabc6611060b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-01 18:29:30 +01:00
Kai Koehne 367cf77cd6 Make tst_examples::namingConvention not fail
The test seems to be wrong. Keep the warning though if other
tests actually rely on the behavior.

Task-number: QTBUG-28271
Change-Id: I862fd442982021f26531f43b56b97f7c7b8c9c69
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-29 13:37:17 +01:00
Alan Alpert f21e9ba6ef Remove interim compatibility measures
Also update some variables in qtdeclarative which failed to update
rootItem->contentItem.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3
Reviewed-by: Alan Alpert <416365416c@gmail.com>
2012-10-16 07:24:06 +02:00
Iikka Eklund 46010aa7a2 Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-23 08:22:24 +02:00
Kai Koehne 08444bab1b Autotests: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5.

Change-Id: Icb6423c7d9f7e507ba36376b0af5ad183379c494
Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
2012-09-14 14:51:47 +02:00
Alan Alpert d65fb68de1 Only test qtdeclarative examples for naming convention
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8deabccddddd
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-08-29 04:42:06 +02:00
Friedemann Kleint bd618f62d8 QtDeclarative: Remove usage of deprecated qWaitForWindowShown().
- Replace by qWaitForWindowExposed() or
  qWaitForWindowActive() where applicable.
- Use QVERIFY to verify success.
- Stabilize some tests by checking for 'active',
  add missing call to show().

Change-Id: I6cae063e44a3839760ed9f61dacb26cd1717118d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-07-19 14:37:49 +02:00
Alan Alpert feb996e3ab QQuickCanvas renames
QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.

The first three changes have interim compatibility measures in place to
ease the transition.

Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-07-17 07:26:15 +02:00
Toby Tomkins ec949bad2d Skip svg related test that is ASSERTing through no fault of declarative.
Task-number: QTBUG-26528

Change-Id: Id4a610ede0a9cbb8e58d8d8f4ff98cde3c27a6ec
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-07-16 04:47:29 +02:00
Bea Lam 4c671c046e Fix doc snippets paths and parsing errors
qtqml.qdocconf and qtquick.qdocconf now refer to the correct
snippets and source directories.

Snippet paths in .qdoc and .cpp files have been updated to refer to
the new shortened path references, e.g. \snippet qml/file.cpp instead of
\snippet doc/src/snippets/qml/file.cpp.

This also deletes snippets from src/qml/doc/snippets that belonged under
src/quick/doc/snippets (and were already duplicated there anyway) and
restores some snippet files that shouldn't have been deleted.

Also fixes some inline snippets to use \code .. \endcode instead of
\qml .. \endqml as they contained javascript or partial QML
snippets that were causing parsing errors from qdoc.

There are still snippet errors arising from qmlintro.qdoc as the
qmlintro snippets directory that it refers to cannot be located.

There are also two references to a removed snippet identifier in
examples/qml/cppextensions/plugins/plugin.cpp that need to be fixed
in conjunction with the related docs in a later commit as the relevant
code has changed and the docs are now invalid.

Task-number: QTBUG-25721

Change-Id: I50c665245a74c140470c58a32546591d187dfe4b
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2012-05-31 10:40:41 +02:00
Bea Lam 09e624fa6b Remove duplicated doc files and images
- Remove doc/ files which were duplicated under src/quick/doc and
  src/qml/doc
- Remove duplicated images under src/doc/qml/images which were already
  under src/doc/quick/images
- Merged 0102413396 and
  3b04bbde63 which made it into doc/src
  but not src/qml/doc

Change-Id: I275b7d29f9fc2222dcf801c257c1f67b5880446b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-05-24 09:40:21 +02:00
Kurt Korbatits 5de103291d Fixed unittests skipping for cross_compile option
- qmlmin, qqmlparser, examples unittests to skip source dependent
  tests when cross_compile option used as content not available.

Change-Id: Ieaadeff0c303f0a633b8a3cc506a764ea995cf42
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-03-29 00:35:32 +02:00
Chris Adams d73e6d4374 Disable particle-related examples from tst_examples
CustomParticle and ShaderEffect are currently broken.
Disabling these examples until they can be fixed.

Task-number: QTBUG-24034
Change-Id: Ic1ebba1f66f28495822cd729af1e1c24acad79da
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-03-14 09:14:32 +01:00
Martin Jones 34280c409d Reuse a QQuickCanvas in examples auto test.
Much faster than creating a new one for each example.

Change-Id: Ic32f244047e0dba78134ba0e3d368260be838f1e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2012-03-14 04:20:17 +01:00
Kurt Korbatits 72f4ccecf4 Changed quick tests to work from install directory
- Changed tests to use TESTDATA
- added check for cross_compile option to skip when sources not available

Change-Id: I1f382794ff982bbc07fc20438a4e4a8c8b8d565f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2012-03-07 06:24:24 +01:00
Matthew Vogt 0284817d6c Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
2012-03-05 11:39:54 +10:00
Matthew Vogt b855240b78 Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-24 04:51:31 +01:00