Commit Graph

1737 Commits

Author SHA1 Message Date
Liang Qi 53fcf914e2 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf

Change-Id: I363b4779fe630b7956f6582ac3821d4ea8ee34c8
2017-06-07 12:37:40 +02:00
Thiago Macieira 9546547495 Position the break statement in the proper place
That is, AFTER the statement of the case label. Alternatively speaking,
resolve dead code problem.

Change-Id: Ia3e896da908f42939148fffd14c480ca73c1be4b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-06-05 06:34:35 +00:00
Liang Qi 77905825ef Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I3775af6323e192ab6473c50e5db90ae1237126d9
2017-05-31 08:12:19 +02:00
Miikka Heikkinen 84490ff75b Highlight bars example
Change-Id: Ic152a0ce98d1feefe81a585b0086fd971ebe62ed
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-05-17 12:07:11 +00:00
Oswald Buddenhagen 400caf7d7c Bump version
Change-Id: I98dfc9c2551700c161dc07a0a93d6c77b681b300
2017-05-10 19:07:20 +02:00
Antti Kokko 1a1dc5abdb Update changes file for 5.9.0
Listing important changes and bug-fixes.

Change-Id: Ic6f304b054d6b8ae349faf0b5c2ee0df2da1e314
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-05-05 08:48:43 +00:00
Julian Strobl bc89be768b Fix bundling of module for static builds
Without this patch the module is not bundled in static builds correctly
causing 'module "<QtModule>" is not installed' errors in during runtime.

As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)'
at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false',
which indicates that the module was not registered.

Task-number: QTBUG-59559
Change-Id: I37003c4305fbe499c9911ff2aefa35deab832bdf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-05-05 04:51:07 +00:00
Sami Nurmenniemi 0340120d5f Disable/blacklist failing tests for boot2qt
Currently boot2qt is tested with QEMU and some tests fail. Disabling
them for now to make it possible to enable qt5 tests for Coin.

Task-number: QTBUG-60266
Change-Id: Ic6494b8a17d4bd277f04472bea9d83cb20bc3805
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-28 11:16:53 +00:00
Stephan Binner d58ec7629b Fix build for -no-feature-wheelevent
Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-24 12:10:49 +00:00
Liang Qi e7b022ec33 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf

Change-Id: Ibb41c2bb83df7e02696e27afe62e94ed059284ae
2017-04-21 11:12:27 +02:00
Leena Miettinen 73ec35fa12 Doc: Edit custom item, label, and volume docs for grammar and style
Change-Id: I2b5a546c5035cbf304db57d3e18c998421969392
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-07 07:00:27 +00:00
Leena Miettinen ddc020d607 Doc: Edit data item docs for grammar and style
Change-Id: Ic93eb2648bdff84e88acdf7941ddd85cc6d874ca
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-07 07:00:11 +00:00
Leena Miettinen 6725566ff3 Doc: Edit data proxy documentation for grammar and style
Change-Id: Ibf26f40e53e8dab3cea717c6ca55e2568cb747e1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-07 06:59:42 +00:00
Thiago Macieira b9bcebb380 Mark qtdatavis3d as warning-free
This will turn -Werror on for our tested compilers, to avoid introducing new
warnings.

Change-Id: I27b55fdf514247549455fffd14b17ae6dce9976f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-03 04:48:52 +00:00
Thiago Macieira 211a86665f Fix warning about member initialization out of order
Instead of fixing the order in the constructor, let's fix the
order of the declarations to follow the rule of thumb to avoid
padding holes.

 q3dlight.cpp:107:5: warning: field 'q_ptr' will be initialized after field 'm_automaticLight' [-Wreorder]

Change-Id: I27b55fdf514247549455fffd14b17abe78cbad28
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-04-03 04:48:44 +00:00
Leena Miettinen 1a4d36afc8 Doc: Edit the series docs for grammar and style
Change-Id: I9b03e4e3cf600fa68a4d7f0372b0fba676affb65
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-27 07:48:25 +00:00
Leena Miettinen 730683467d Doc: Edit the axes documentation for grammar and style
Change-Id: I2109585660af7cfcae2cfd779ebfc67d341a09f5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-24 09:18:52 +00:00
Leena Miettinen 349fe9e201 Doc: Add an overview of data visualization
Move some information from the front page and the known issues
to the overview. Add some information to the interacting with data
topic.

Change-Id: Ia63e1d46ec48861a144c51f0d8796809ea771ea4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-21 12:06:57 +00:00
Leena Miettinen fb9e66188e Doc: Fix QDoc error by using #ifndef Q_QDOC to omit unused function
Also fix the function signature in the qdoc file.

Change-Id: If8a7cb83f94efb9a5a999c99fce722e4ffb96312
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-17 08:25:11 +00:00
Mika Salmela a29f9af154 Enable transparency for walls
When alpha value for wall is below 1.0, enable blending for walls.
Rearrange code so that solid objects are drawn first and then possible
tranparent objects.

Task-number: QTBUG-59140
Change-Id: I5087a664a59ecdb4516b17e8fac1f8ff48ad1c16
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-10 07:37:59 +00:00
Leena Miettinen 7d278e3bcf Doc: Remove installation and build information
Qt Data Visualization is now a standard Qt module that can be
installed and built as any other module.

Change-Id: Idb7e05304e159c30614d728529261d3ec2ea6002
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-03 07:37:41 +00:00
Leena Miettinen 6eef3713c3 Doc: Add \brief commands for property docs
Change-Id: I21c74d848088bdbf1ddfc4339deede65eb750c6f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-03 07:35:03 +00:00
Leena Miettinen 4fc456a22b Doc: Fix \brief and \return commands (Q3dSurface)
Remove property getter docs, because they do not add any info,
and move setter docs to separate entries.

Change-Id: I78a0dab0ec9652b58b319f09dc5266e36d12e85a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 12:50:53 +00:00
Leena Miettinen aff7fe6947 Doc: Add \brief commands to property docs (Q3dCamera)
Change-Id: If73980ebc6b34ebae2c362f90837e62910477d37
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 12:50:42 +00:00
Leena Miettinen 40394feb44 Doc: Fix QDoc commands (QItemModelBarDataProxy)
- Use \list command for lists
- Add \brief commands for property docs
- Replace \returns with "returns"

Change-Id: I7930a9dd9ce87c61e8381a5e2c4f42c7bf0ae75a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 10:05:24 +00:00
Leena Miettinen fc946bae29 Doc: Add \brief commands for property docs (Q3dInputHandler)
Change-Id: Ie133649df4efb6c3acb7bdb3adcc311822aae590
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 08:24:12 +00:00
Leena Miettinen 7a076c2e4e Doc: Fix some references in ItemModelProxy type docs
Change-Id: Ia32c27f8d05ee8fb87ce4ed9f4bee2d99e0e61de
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 08:24:02 +00:00
Leena Miettinen aa998a9288 Doc: Add \brief commands for property docs (QAbstract3dGraph)
Change-Id: I076eafb31ab9710f59eb47287cf91882a56bb8e7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 08:23:51 +00:00
Leena Miettinen 858ce10434 Doc: Fix \brief and \return commands (QAbstract3dInputHandler)
Change-Id: I68118110654675af9e4c514a48a78f501597e54a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-03-02 08:23:31 +00:00
Liang Qi 5adf257beb Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I4a90e10341cff0615150101501a086aa3b0d847a
2017-02-28 13:04:10 +01:00
Leena Miettinen 839c3d4b0a Doc: Add \brief commands to property docs (Q3dScene)
Change-Id: I1124ecce8a81256916e4936dc952ea619082a272
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 09:54:03 +00:00
Leena Miettinen 7f1ac56ddc Doc: Fix \brief and \return commands (QSurfaceDataProxy)
Change-Id: I3a44f525b75a7f89d3aaaaf38342ec5e1de66bae
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 09:53:50 +00:00
Leena Miettinen 5799a84b1d Doc: Fix QDoc commands (Q3dBars)
Change-Id: I75cb18ad5ea6b7c88c940d52ccb82753fcc0c7c7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 09:17:38 +00:00
Leena Miettinen bf772e8914 Doc: Add \brief commands for property docs (QScatter3DSeries)
Change-Id: I7d3e77746ba81f76ec22c7a4b8779df56e680f78
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 09:16:37 +00:00
Leena Miettinen 4890251827 Doc: Fix \brief and \return commands (Q3dScatter)
Change-Id: I45c048acffc57b56205b694dd4fcb4b89917b5a3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 08:39:04 +00:00
Leena Miettinen a94714553d Doc: Fix \brief and \return QDoc commands (QSurface3dSeries)
Change-Id: I95eeefc57ccefe8548c76f40157148c0a5cb8196
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-02-27 08:38:51 +00:00
Leena Miettinen 8aeb49ef4d Doc: Add \brief commands for property docs (QItemModelScatterDataProxy)
Change-Id: I014470926e16e1b5f0b00f263e321302bbfa6652
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 08:38:38 +00:00
Leena Miettinen 5453005579 Doc: Add \brief command to property docs (Q3dLight)
Change-Id: Iae596f33b2f263452206cbb7d5728d6d4798738e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 07:58:50 +00:00
Leena Miettinen baef01e8da Doc: Edit 3D object class and type docs
Fix grammar and QDoc command usage.

Change-Id: I5d9c3f40b9a2fa83bce42ff3978c27b5358fb87a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 07:58:38 +00:00
Leena Miettinen 782a5c2e5e Doc: Fix QDoc commands (QScatterDataProxy)
- Add \brief commands for property docs
- Replace \returns with "Returns".

Change-Id: I49b67c8a86135666e43c89f787a0821b48b5587a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-27 07:58:18 +00:00
Leena Miettinen 743f32ee77 Doc: Fix QDoc commands (QItemModelSurfaceDataProxy)
- Add \brief commands for property docs.
- Replace \return with "Returns".
- Use the \c command to format "true".
- Edit the text where necessary.

Change-Id: I9ab1f5ed2c242118990d08da8114012899d88289
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-02-23 09:48:13 +00:00
Leena Miettinen 2c6b1bb0ab Doc: Add \brief commands for property docs (QHeightMapSurfaceDataProxy)
Separate setter function docs to from property docs, to be able
to describe the arguments for the setter functions.

Change-Id: I60bd1a31cd1424260070c231af48c9603916d132
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-02-23 09:47:09 +00:00
Leena Miettinen e707a33964 Doc: Fix QDoc commands (QCustom3dVolume)
- Add \brief commands to property docs
- Fix \note commands (the colon after the command results in a double
  colon)
- Remove \a commands from property docs
- Replace the \return command with "returns"

Change-Id: I0dd555a350999d588fff904d5a46c6d57e8f6199
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-20 07:59:52 +00:00
Leena Miettinen 0d05ce4863 Doc: Add \brief commands to property docs (QCustom3dLabel)
Change-Id: Iafc407d288ef26d94b33ea07e36f34da5a9f38a0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-20 07:59:39 +00:00
Leena Miettinen 74e1330da5 Doc: Add \brief commands for property docs (QCustom3dItem)
Change-Id: I37f31a95e35722a78040055d045206082aaf457c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-20 07:59:27 +00:00
Leena Miettinen 12cf04a5ef Doc: Add \brief commands for property docs (QBar3DSeries)
Separate documentation for setSelectedBar() from the property docs.

Change-Id: Iaf9e6b2cfeccd47cb5b3fee2fa8cd8baa43b8fcd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-17 09:39:03 +00:00
Leena Miettinen 2569161fc4 Doc: Add \brief commands for property docs (QBarDataProxy)
Change-Id: Ia3e4811e76f63913d84d86d9e0d41f5976b3c4ad
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-17 08:37:44 +00:00
Leena Miettinen 1d0946b47c Doc: Add \brief command for property docs (QAbstractDataProxy)
Change-Id: Ie23fb3c9cd5a1e2197fda2231cf6b5dab9e3f64c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-17 08:37:31 +00:00
Leena Miettinen c21c46ff3b Doc: Add \brief commands to property docs (QAbstract3dSeries)
Remove \a commands from property docs.

Change-Id: I50b7cdbe144d157580c9e647a44708e93ab81784
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-02-17 08:37:18 +00:00
Leena Miettinen 25aeaddbfb Doc: Add \brief commands for property docs (axis)
Adjust the text as necessary. Also remove \a commands, because
properties don't take arguments.

Change-Id: I9f2198e383806de6a4f06745f1398d67aee4ac09
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2017-02-10 16:06:14 +00:00