Commit Graph

1637 Commits

Author SHA1 Message Date
Oswald Buddenhagen 01347e7ee8 Bump version
Change-Id: I9fc841f390283b3711f6fe5548473adfe67a1dc2
2017-02-02 15:32:04 +01:00
Liang Qi f750a084be Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	.qmake.conf

Change-Id: I10b221188c4306563f3b150f048d5f99aefc9fb1
2017-01-24 13:56:05 +01:00
Mika Salmela f03ed59a58 Add mutex guards for AbstractDeclarative::updateWindowParameters
Adds a mutex to guard that pointer to controller is not deleted while
doing updateWindowParameters. The render thread doesn't have control to
the node mutex, so that won't apply since it may be deleted while requesting
a mutex.

Change-Id: I8897954415c1bd7ab61ef99b420c9ac2aaa89411
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-01-12 10:18:35 +00:00
Tomi Korpipää beb420e399 Fixed incorrect value axis autoAdjustRange behavior
Change-Id: I8c52745f18a710add9e257a4fe587833f711a2f2
Task-number: QTBUG-57599
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2017-01-04 11:58:41 +00:00
Oswald Buddenhagen 5956881b9a Bump version
Change-Id: I6be843a4ef3816200157edbf70530e952377169e
2017-01-03 13:27:36 +01:00
Oswald Buddenhagen 79b16f7f7b remove redundant MODULE_INCNAME
the value was the default, and the variable is reserved for Very Special
Magic (TM) anyway.

Change-Id: Ib81471b685471f5a2f7c1d0f0c2443c09c1e9707
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-01-02 13:25:36 +00:00
Thiago Macieira 27fe1a1564 Fix warning about change of sign
setSelectionIdRange takes uint as parameters, so pass unsigneds.

engine/surface3drenderer.cpp(2445): warning #68: integer conversion
resulted in a change of sign

Change-Id: Idc347fbb462f4122b044fffd14905eea36583259
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-12-17 02:08:40 +00:00
Liang Qi 54910f8cf8 Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	tests/auto/cpptest/q3dscene/tst_scene.cpp
	tests/auto/qmltest/scene3d/tst_scene.qml

Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
2016-12-12 12:23:04 +02:00
Friedemann Kleint 21c82c7e0d qtouch3dinputhandler_p.h: Add "We mean it." comment
Fix warning:
QtDataVisualization: WARNING: qtdatavis3d/src/datavisualization/input/qtouch3dinputhandler_p.h does not have the "We mean it." warning

Change-Id: I74c3c0d8f525322b135302b3ddd166c7d99010f1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-12-02 07:16:23 +00:00
Mika Salmela 4913ce866f Handle data proxy change on the controller
Adds a connection to controllers to react dataProxyChange signal.

Task-number: QTBUG-57291
Change-Id: Ia9ad6880418ec861381e1a5363ce38f8d0bda2e8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-29 14:06:06 +00:00
Liang Qi a78f8d6bef Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I42fd801107912d52c3e1bcd52d98d4362e2c27ef
2016-11-26 12:53:01 +01:00
Tomi Korpipää 470330e69b Updated README and changes file
Change-Id: I7c8ba93e2106133af52b690a48581092094a6a04
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-23 09:37:28 +00:00
Tomi Korpipää e584f8753a Allow light position modification by user
Change-Id: I7efd56754bae16990fd11081493da0a37698f76b
Task-number: QTRD-1803
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-18 11:17:22 +00:00
Tomi Korpipää 4ff14c23b2 Update .gitignore to ignore qmlc files and build folders
Change-Id: I902ea6af3ee4f0be08ea4cc73a013b00666ece85
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-17 09:48:33 +00:00
Tomi Korpipää b3fed1c9b2 Check if we got OpenGL2.1 functions before trying to use them
Change-Id: Ia8b4a25094d4a608d3a20b808fd14c3941ae2dff
Task-number: QTRD-2116
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-17 09:13:09 +00:00
Tomi Korpipää 0bf42b29a9 Updated changes file
Change-Id: I1487c602e0b9f55f08f1b53413c1d9d1e70768fc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-14 10:50:33 +00:00
Tomi Korpipää 0d4096ab9d Fixed inability to set subviewports
Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553
Task-number: QTRD-1807
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-14 10:39:07 +00:00
Tomi Korpipää 87339612d2 Ensure that the formatter is respected for zero and negative values
This also ensures that INF and NaN numbers are also handled correctly

Task-number: QTBUG-57075
Change-Id: I8db693cb28303bc13f936c818147fe31b7ee1199
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-11-14 09:32:13 +00:00
Liang Qi 3f5c279083 Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	examples/datavisualization/bars/doc/src/bars.qdoc
	examples/datavisualization/custominput/doc/src/custominput.qdoc
	examples/datavisualization/customitems/doc/src/customitems.qdoc
	examples/datavisualization/draggableaxes/doc/src/draggableaxes.qdoc
	examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc
	examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc
	examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc
	examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc
	examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
	examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
	examples/datavisualization/qmlspectrogram/doc/src/qmlspectrogram.qdoc
	examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc
	examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc
	examples/datavisualization/rotations/doc/src/rotations.qdoc
	examples/datavisualization/scatter/doc/src/scatter.qdoc
	examples/datavisualization/surface/doc/src/surface.qdoc
	examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc
	examples/datavisualization/volumetric/doc/src/volumetric.qdoc
	src/datavisualization/doc/src/qtdatavisualization.qdoc

Change-Id: Ic15e77b1fee0708a235bf21815f72b854981537a
2016-11-08 11:46:38 +01:00
Leena Miettinen 779f6d8c23 Doc: Add dependency to Qt Widgets to enable automatic linking
Change-Id: Idf59ce8f3c225cbcd5c314fc1c25d94696ac3436
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2016-11-04 13:16:52 +00:00
Topi Reinio 90aff70262 Doc: Use capitalization in section titles
Change-Id: I3ea9dde5f98813716d754d292af1f005d33ba98e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-11-02 12:46:21 +00:00
Leena Miettinen e9aa193181 Doc: Add section on running examples to example docs
- Include examples-run.qdocinc from qtbase/doc/global.
- Add section title to Audiolevels example docs.
- Remove unnecessary leading paragraph from Custom Proxy example docs.
- Remove information about running examples from Getting Started topic.

Change-Id: I33e8189fa20bad38e52f424b0143b4031ad7872f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2016-11-02 09:45:10 +00:00
Leena Miettinen a6b83f1f28 Doc: Use standard headings on the front page
Link to the examples page instead of listing the examples here.

Change-Id: Ia1ae2796055d42e1aa5de8768808c23ab5d02134
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2016-11-02 08:50:54 +00:00
Leena Miettinen 8e59b4a63a Doc: Add a \brief command to the QtDataVisualization namespace docs
...to display them correctly in tables.

Change-Id: I09c92ebbe684828e282b7675b584a971f0f72f4f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2016-10-10 07:25:54 +00:00
Tomi Korpipää 96086b01a3 Fixed some autotests
Some compare types seems to have worked incorrectly and/or differently in
previous Qt versions. Made changes to autotests accordingly.

Change-Id: Ia2c5da59ebec76718266a8009bbffe060ae32470
Task-number: QTBUG-55910
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-09-27 03:16:01 +00:00
Oswald Buddenhagen bba7b9aced Bump version
Change-Id: I5691ea917b87b3a22882ad380beba76bf3f01cb2
2016-08-29 14:37:32 +02:00
Simon Hausmann b6c5569f21 Fix loading of QML plugins
Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader
is strict about requiring the correct interface id, to avoid loading
unrelated plugins in the loader thread (which they may not be prepared
to do).

Change-Id: Ie7ef84be45bb89887fac47fd9ac1d024a0a41acd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2016-08-29 04:40:01 +00:00
Liang Qi 43c0bfb2af Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	.qmake.conf

Change-Id: I709c31705a7edc722039caa4b1c57a0627bde8b9
2016-08-02 10:19:52 +02:00
Liang Qi 2523056490 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/datavisualization/datavisualization.pro

Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
2016-08-01 09:16:51 +02:00
Oswald Buddenhagen 1533ffc6d8 Bump version
Change-Id: I4193c5b7e08a40a9dc76bc0deaa77593984fe178
2016-07-28 13:51:54 +02:00
Liang Qi d6a8da66dc Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I38af779191ffc1038bf04ef22249ac99fb6eca55
2016-06-16 07:09:15 +02:00
Tomi Korpipää 643a6ad187 Change file updated
Change-Id: I49e6779be815a30e39b72b8701caa679ed1aee2a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-09 09:30:41 +00:00
Leena Miettinen 57832c490a Doc: Fix examples install path for Qt Creator
Without this fix, Qt Creator does not find the example
files for opening them and tags the examples as "broken".

Task-number: QTBUG-53752
Change-Id: I8bc88c79626d1a0f2f6319b3283c9541d6ddd965
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
2016-06-02 08:39:03 +00:00
Liang Qi e91b9713cc Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I05e7c35760c0caf0a8b71823210dc0d78c1784ce
2016-05-24 20:00:08 +02:00
Oswald Buddenhagen 4d4a9609fa do not enable example installs explicitly any more
it's done centrally now.

Change-Id: I70d8aeb77388aa3895007b7aa03f84dad085bc2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-24 12:47:42 +00:00
Tomi Korpipää f39c154be4 Set up relation with c++ module correctly
TARGETPATH to be removed in 5.7

Change-Id: I5f2b7c6c82e10bed6b7a2358d8269bc0aef26542
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2016-05-24 08:23:07 +00:00
Tomi Korpipää 81d6939b8b Don't duplicate functionality from various .prf files
Change-Id: Ibaf10cb5806dae0287888a20d26e34d4dfefff75
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-23 12:20:34 +00:00
Tomi Korpipää d8ad287b81 Remove unused non-standard test export macros
Change-Id: Ifcfb6eaddfd5e54820bb3f5af235833b7f906b3c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2016-05-23 09:06:36 +00:00
Tomi Korpipää f7faf946d5 Use standardized module export macros
Change-Id: Id6122641b63d8e1435314c1ae8492a7ee96b25a8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-23 05:01:08 +00:00
Tomi Korpipää 1217b9d8bd Remove redundant handling of static builds
Change-Id: I7f504bcd21045d6eaf2534d3ab2416b402e88b87
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-20 03:23:51 +00:00
Tomi Korpipää aec04a870d Place load(qt_module) at the end of the project file
Change-Id: I612e0334d72c0405b7c180c1e90381eb5641dcaa
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-20 03:23:41 +00:00
Liang Qi 02af08a705 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/datavisualization/datavisualization.pro

Change-Id: Iaa51ffb3d2f111595bed4b200cbedd9c2c3b5f34
2016-05-19 21:28:42 +02:00
Tomi Korpipää 6dde737184 Remove debug message
Change-Id: I7bab1d2f8187a65abf3602e19e9baa6f78d0c496
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2016-05-19 08:17:20 +00:00
Simon Hausmann 2f6074fde0 Prospective fix for documentation build
Make the generated qhp file name match what qdoc expects later for
qch generation.

Change-Id: I85996c350d89f8d2638b08ba285fee0eba9b5b6f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2016-05-10 05:56:52 +00:00
Kai Koehne 49e36525ce Skip build for missing opengl dependencies
Do not error out if opengl is missing, but rather skip the build. This
allows people to compile qt-everywhere packages with e.g. -no-opengl .

Change-Id: I08212b53e37931347b6f6bea5736f99111bcdc92
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2016-05-03 14:31:39 +00:00
Tomi Korpipää 0ba2071f90 Renamed qdocconf
Task-number: QTBUG-52750
Change-Id: I964f62c8f748022797d604214b0355a807e16b12
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
2016-04-22 06:49:21 +00:00
Liang Qi 13a8c4eb99 Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I17383a4cdebb3c54489f6f39e1ad7ae136d80971
2016-04-08 23:42:33 +02:00
Liang Qi 8427634773 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/datavisualization/utils/qutils.h

Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
2016-04-08 10:33:17 +02:00
Oswald Buddenhagen 364ed207af fix namespaced build
Change-Id: I76b85f4e2653f20a368b4b413b29c733a6a3f300
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2016-04-06 11:16:33 +00:00
Marc Mutz 7d16c73212 Add explicit and make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.

QtBase 5.6 headers already compile that way, so let the other
modules follow suit.

Added explicit where it was missing. This is not a source-
incompatible change, because code that breaks by this is
a bug. Let's not have this sitting around in an LTS.

Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d
Task-number: QTBUG-45291
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2016-03-03 16:14:27 +00:00