aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless using clause that prevents building on INTEGRITY.v5.7.0-beta1Rolland Dudemaine2016-04-121-1/+0
| | | | | | Change-Id: I926b6278bb173091537bb2110082ef370cd4c349 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-04-08193-310/+349
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-08193-310/+349
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change also fixes the build of two benchmarks, tst_affectors and tst_emission. Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro src/qml/qml/ftw/qhashfield_p.h tests/benchmarks/particles/affectors/tst_affectors.cpp tests/benchmarks/particles/emission/tst_emission.cpp tests/benchmarks/qml/pointers/pointers.pro tests/benchmarks/qml/pointers/tst_pointers.cpp tests/benchmarks/qml/qmltime/qmltime.pro tests/benchmarks/qml/qquickwindow/qquickwindow.pro Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
| | * qml: Remove unused QHashField class.Robin Burchell2016-04-062-113/+0
| | | | | | | | | | | | | | | | | | Change-Id: I8dd234d06048e6d8e7b2dfccb59d639ad167022b Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Move Qt Quick scenegraph resources under the :/qt-project.org/ directoryGiuseppe D'Angelo2016-04-019-34/+34
| | | | | | | | | | | | | | | | | | Change-Id: Ib1c2695f86837b02ba4aaf49184421cd464f7c20 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * Move Qt Quick resources under the :/qt-project.org/ directoryGiuseppe D'Angelo2016-04-015-9/+9
| | | | | | | | | | | | | | | | | | Change-Id: I7c7745264ff66b7db042e19f6d44124fa78bb86c Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * Give a nicer error if the passed item doesn't existAlbert Astals Cid2016-04-011-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of Cannot read property 'width' of null and a line pointing to TestCase.qml, you get No item given to mouseWheel and a line pointing to the offending code Change-Id: I8e035878035cb836a4c0c33a772ad4353d8dd000 Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Documentation: fix vector3danimation property type names.Vladimir Moolle2016-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Was real instead of vector3d. Task-number: QTBUG-52213 Change-Id: Ib8d9bb39b51277c6f63d2b5c45433542a127149d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| | * Fix crash in hasAtlasTextureAlbert Astals Cid2016-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for the QSGTextureProvider not being 0 before asking for its texture, we are doing the same in the loop of QQuickShaderEffectMaterial::compare so it was forgotten to do it here. Valgrind trace of the crash i get without it ==26317== Invalid read of size 8 ==26317== at 0x652B73A: hasAtlasTexture(QVector<QSGTextureProvider*> const&) (qquickshadereffectnode.cpp:49) ==26317== by 0x652BABC: QQuickShaderEffectMaterial::compare(QSGMaterial const*) const (qquickshadereffectnode.cpp:396) ==26317== by 0x63D1BF6: QSGBatchRenderer::Renderer::prepareOpaqueBatches() (qsgbatchrenderer.cpp:1525) ==26317== by 0x63DE7A7: QSGBatchRenderer::Renderer::render() (qsgbatchrenderer.cpp:2611) ==26317== by 0x63E9D3E: QSGRenderer::renderScene(QSGBindable const&) (qsgrenderer.cpp:208) ==26317== by 0x63EA58A: QSGRenderer::renderScene(unsigned int) (qsgrenderer.cpp:168) ==26317== by 0x63FAA7D: QSGRenderContext::renderNextFrame(QSGRenderer*, unsigned int) (qsgcontext.cpp:558) ==26317== by 0x644540A: QQuickWindowPrivate::renderSceneGraph(QSize const&) (qquickwindow.cpp:383) ==26317== by 0x641541A: QSGGuiThreadRenderLoop::renderWindow(QQuickWindow*) (qsgrenderloop.cpp:378) ==26317== by 0x6416520: QSGGuiThreadRenderLoop::event(QEvent*) (qsgrenderloop.cpp:474) ==26317== by 0x605F488: QCoreApplication::notify(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.5.1) ==26317== by 0x605F5BA: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.5.1) ==26317== Address 0x0 is not stack'd, malloc'd or (recently) free'd Change-Id: I3b07450438d98910fbbff9f8b7a3d9d851ed4e5d Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | * Purge sRGB chunks from PNG in tests.Edward Welbourne2016-03-2930-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: I9e4dc3aec97cd32bc8ac216fadeaf7669c49647c Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * Remove empty .pro fileJoerg Bornemann2016-03-241-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia85ced87b9cb0ad2093bdfc4abcf222929bc8bd5 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| | * Fix Image.Pad on high DPIJ-P Nurmi2016-03-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take device pixel ratio into account (pixWidth and pixHeight are scaled) while calculating source and target rects for QQuickImage::Pad. Change-Id: I4a8b4fc305d0af93921bca900c683927d6bfd0e3 Task-number: QTBUG-52043 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * Purge sRGB chunks from PNG in documentation.Edward Welbourne2016-03-2420-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: I23d7a43ba6c6ce6cafa11c1950a118a73f4d07cd Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Purge sRGB chunks from PNG.Edward Welbourne2016-03-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects src/particles/particleresources/noise.png to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: I534f7c16830912fe0ee17159e50094e490b62b70 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-2456-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: If3baf60fb7c0045446ddfddecef96374845e739e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Fix qmlRegisterSingletonType documentationBogDan Vatra2016-03-241-3/+2
| | | | | | | | | | | | | | | Change-Id: I36d22343976a2164c396bb17c13526b63ab7579c Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| | * Fix build with -no-guiTasuku Suzuki2016-03-241-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I677ab9fce527b5220317d4d30f48d55b7f081e6a Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Removed the QQmlGuard benchmarkSimon Hausmann2016-03-243-79/+0
| | | | | | | | | | | | | | | | | | | | | | | | It's not really useful for automated benchmarking and by now most of QQml has been ported to QPointer. Change-Id: I4ee34ad481fde9ae9903ad50cba7afd7b6ff7bc5 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * Use pixel() instead of scanLine() to check the colorAndy Shaw2016-03-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | For some image formats it is not possible to rely on scanLine() so it is best to use pixel() for this check as it will take into account the format of the image correctly. Change-Id: Iee753b79291f210d243a5aed9d61359c67a78931 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| | * Merge "Merge remote-tracking branch 'origin/5.6.0' into 5.6" into ↵Frederik Gladhorn2016-03-171-0/+158
| | |\ | | | | | | | | | | | | refs/staging/5.6
| | | * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-0/+158
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ib78004ccd9fed4a7e35fb5a91a886239e0a2085b
| | | | * Added change log for 5.6.0v5.6.0Simon Hausmann2016-02-261-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22db5616d9f2e02cb0126ff427a5bdd4423b5fc9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * | | Handle duration of zero in QML animatorsDavid Edmundson2016-03-173-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle a duration of zero in animators using the same approach as animations. Task-number: QTBUG-39766 Change-Id: I1628292ad259ec5ec5d3bb0770440efa5fa6dad0 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * | | Add benchmarks to the "make benchmark" targets that are known to workSimon Hausmann2016-03-1725-29/+31
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | The qjsengine benchmark is one exception that is omitted because it crashes currently. Change-Id: Ic93344dc864d0d6427d85faa12a2753126be808e Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * | qmltime: Remove deprecation define.Robin Burchell2016-03-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Not needed, qmltime uses no deprecated stuff. Change-Id: I349993b4974857d947ea014bedfc544aaf7c682c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | Move qmltime out of benchmarks directory.Robin Burchell2016-03-1526-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a tool, not a benchmark. Change-Id: Ie6b4452a1235923e1663a8a525ddad8408d21545 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | qmltime: Remove widgets dependency.Robin Burchell2016-03-113-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To do this easily while retaining the meaning of the -parent flag, we add a private export to QQuickView so that we can set the root object. Change-Id: Iabb2b998816a6fdfcc8417f679c96f04910b8202 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | * | Prevent worker thread of FolderListModel from starting immediatelyJoni Poikelin2016-03-112-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Worker thead may have started iterating through filesystem before component was completely initialized, resulting in unnecessary and unexpected results. Task-number: QTBUG-49898 Change-Id: Ibaa2572139b0aed2fdc9bd3bbcdffa58791e38d7 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * | Remove unused variableThiago Macieira2016-03-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by ICC. Change-Id: I0c94a5c2846b48c8aea7ffff14352fd8573cbf66 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| | * | Fix error message when Python could not be foundSimon Hausmann2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The python script works with Python 2 as well as version 3. Task-number: QTBUG-51753 Change-Id: I630b7b1811e9896e30b7ba75af972552f1063eff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | Doc: Modified qtquick.qdocconf to exclude private header fileNico Vertriest2016-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9bdd42ca47853e343c26bc9d1b9c563b75af4f7 Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * | Doc: Replace the reference to QQmlComponent::endCreateVenugopal Shivashankar2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic1bf883003f6e20efa3fdba9ad29a8c8276b043e Task-number: QTBUG-51713 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | | Blacklist tst_qquicktext::lineLaidOutRelayout() for MSVC 2015.Friedemann Kleint2016-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-51934 Change-Id: I2b7aa4846e013f4fa498b7b997de01f53e03d625 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | | tst_qquicktext: Ensure windows are cleaned up on test failure.Friedemann Kleint2016-04-071-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a QScopedPointer to guard them. Task-number: QTBUG-51934 Change-Id: I622fe782e0bd232cb1cc6ffc16499830b94334f2 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | | | Ensure the resources are initialized when used staticallyAndy Shaw2016-04-071-0/+11
|/ / / | | | | | | | | | | | | Change-Id: Ifbcd16402189c4621596fc38c3bd8931b3b6a66e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | qsgbatchrenderer: memset nodes instead of using a constructor.Robin Burchell2016-04-061-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since all fields are now POD, and we want them all zero'd anyway. Increases delegates_rect benchmark by maybe 40 or so instances per frame. Change-Id: I1ca2da1e82edb70485b584cb52f4be2f5ffbcf08 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | QML: make QmlContext::qml{Context,Scope} inlinable.Erik Verbruggen2016-04-054-19/+86
| | | | | | | | | | | | | | | | | | | | | | | | Both methods are called in QQmlPropertyCapture::registerQmlDependencies, which is called after every binding evaluation. Change-Id: Ic0c7ff96aa7d0be186d103de9d50eae19f42908b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | QML: Convert the PropertyDependencyMap to a QVarLengthArray.Erik Verbruggen2016-04-052-5/+28
| | | | | | | | | | | | | | | | | | | | | This is much more efficient than a QHash. Change-Id: I84752eecb6a456402ae222c4d6543bbb67cbcf63 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | QML: add some hot-path hints for the compiler.Erik Verbruggen2016-04-052-6/+6
| | | | | | | | | | | | | | | Change-Id: Ic68691639e81a8450311c03e86bcde14e7bd7dd4 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | QML: allow more methods to get inlined.Erik Verbruggen2016-04-057-49/+47
| | | | | | | | | | | | | | | | | | | | | | | | Most of these methods are small, and all of them lie in the 'hot path' for simple bindings like 'width: parent.width'. Change-Id: I0071cec92b49437a352160b0283ed6c89a278a07 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | QML: directly access private data instead of calling accessors.Erik Verbruggen2016-04-051-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to valgrind, these accessors were not inlined. So, instead of placing ~8 calls for creating the QRectF's of geometryChanged, do a direct read of the data. Change-Id: I9ba60e90c87fcecf1c1985f038195e2dd657dd20 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Replace qQNaN() and friends with qt_qnan().Erik Verbruggen2016-04-0518-101/+104
| | | | | | | | | | | | | | | | | | | | | | | | These constexpr functions can be inlined, and the compiler can be a bit smarter with code generation. Change-Id: I4ea87c794dd8e375749e18d273d01bb848231113 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | QML: add type info for the built-in qml context.Erik Verbruggen2016-04-052-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the type for the target temp would be 'var', which would subsequently be corrected to qobject through a member access. That resulted in typing the defining move again, which is unnecessary. Change-Id: Ife993a667331e69aea64ac2af0f64096a142a583 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | QML: do not re-use the resolver data for members.Erik Verbruggen2016-04-043-47/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On successful lookup, the resolver data was cleared and re-used for the resolved member. The effect is that a second time the resolver is used, it will not be able to do the same lookup, resulting in it returning an unknown type. Because the same expression might need to be resolved multiple times (e.g. when a dependency changes type), this results in the wrong type (var), and then more iterations to propagate this wrong type to all usages. Instead, return a new resolver with its own data for the resolved member. This way, a member access on this result can be resolved correctly by this new resolver. Change-Id: Ia930c08a2e4a2182d800192547fc03cba209c78c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Remove dummy implementation for Pass*Ptr operator=().Rolland Dudemaine2016-04-042-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | This resolves a lot of warnings when building with the GHS toolchain. Change-Id: I061dac0bf42f6a8158afe8eee9c898e8f7ee4dd7 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Add a note saying that QQuickWidget::rootObject can return nullAlbert Astals Cid2016-04-041-1/+3
| | | | | | | | | | | | | | | Change-Id: Ia5db63c39287d23c3ed279aa5671a9e7bc7b26c0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Remove traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-013-7/+3
| | | | | | | | | | | | | | | | | | Change-Id: Ie734d6bfcb492c8aeeb18909650a27b1288f2b52 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | | Minor link issue in qquickpropertychangesNico Vertriest2016-03-311-2/+1
| | | | | | | | | | | | | | | Change-Id: I88d588a73daa5465c687a18353b2fd5f82cc5aa1 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | V4: Allow some more functions to be inlined.Erik Verbruggen2016-03-318-34/+34
| | | | | | | | | | | | | | | Change-Id: If9d1f87fd7cf0b12d2827c4574109234be7e8ab8 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | QQuick: remove property index from the accessor functions.Erik Verbruggen2016-03-315-8/+6
| | | | | | | | | | | | | | | | | | | | | This parameter was not used. Change-Id: I1e8c0994cad37fc24105e354a80a4fb0131d58ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 19:48:42 +0000