aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | Warn when requesting unknown RHI backendJohan Klokkhammer Helsing2020-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QSG_RHI_BACKEND is set to something we don't recognize. Change-Id: Ifa18cf38bc110e3a96b94fa89abac5bdfd70ba8a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | * | Examples: enable HighDPI scaling for AndroidAssam Boudjelthia2020-02-242-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These examples show very tiny UI elements on Android devices, thus enabling HighDPI. Task-number: QTBUG-80717 Change-Id: Id3b4184bef74faf9f7d165ac211bd39375d67f62 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | * | Doc: Fix QQuickTableView snippetUlf Hermann2020-02-244-43/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use static registration, provide a .pro file, and make it load and show the right file. Change-Id: I949831a399ce00cd8b3d012d8bd4e95a1efcdeb5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * | Doc: Fix documentation from QQmlEngine::singletonInstance()Ulf Hermann2020-02-241-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't suggest procedural registration of C++ types. Change-Id: Ib133fa7557f7555222fc55344a29967efc5c1f6f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * | Revert "QQuickItemView: do not set parent to nullptr upon destruction"v5.15.0-beta1Ulf Hermann2020-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5445fcac36d7122d533a2bdf0fcfe6206b7f3ff4. The original commit avoids a warning generated for a dubious use case and breaks controls2 in a non-trivial way as a side effect. We should rather live with the warning. Task-number: QTBUG-82368 Change-Id: I6197bb63036cb25ec3e88f549667519b8f3ff13a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtdeclarativeQt Submodule Update Bot2020-03-091-2/+2
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I35bc7c53c80a65fad488f4a734ebb747d338d29d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Stop using Qt::DateFormat's locale-dependent membersEdward Welbourne2020-03-063-48/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're going away on dev. Amended tests to match. Task-number: QTBUG-80441 Change-Id: I00540d2f7a796ae9c080a0fb9f144c145f00ad57 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | | Use static_assert to "protected" QMatrix4x4 accessorSimon Hausmann2020-03-041-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size in qtbase had changed but this went by unnoticed because it only failed at runtime and in the CI the first failing build had assertions disabled. Change-Id: I8891d0a1d0d306629b23eba042ce367cfdb64dfa Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Fix build without commandlineparser and temporaryfileTasuku Suzuki2020-03-043-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmltyperegistrar uses QSaveFile which needs features.temporaryfile Change-Id: Ib64eb2d357ee5e75f12f81f15bbe4969d4d96872 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Fix build without features.settingsTasuku Suzuki2020-02-282-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error: static_assert failed due to requirement 'bool(-1 == 1)' "Required feature settings for file [snip]/qsettings.h not available." QT_REQUIRE_CONFIG(settings); Change-Id: I0759f884531179ed5f625f21c5559389aef5c4ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Remove deprecated PinchHandler.m{in,ax}imum{X,Y} for Qt 6Jan Arve Sæther2020-02-262-69/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id941d7dc6b6ce9207db09cf4790f4401515dbda5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | Provide the labs imports also under QT_VERSIONUlf Hermann2020-02-216-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that they all have QML_ADDED_IN_VERSION we can allow the user to import them also under a later version without losing compatibility. Task-number: QTBUG-71278 Change-Id: I74b9c758ec37ef41e1a53873266df0eeebfcabc7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-2135-134/+289
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickmousearea/BLACKLIST Change-Id: I3de2c6377d57f5f9204d2cfc688d50a7a0b4150c
| | * | Fix QML basic type documentationEdward Welbourne2020-02-201-26/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the documentation of some limitations that no longer apply. Fixed up grammar in the process. Fixes: QTBUG-82249 Change-Id: I807cbef10393f11bf864cf44ddd7556aa0eabb92 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Avoid cast from ASCII to QStringUlf Hermann2020-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous attempt to fix this was lost in a merge resolution. Change-Id: I0638c434543d231352c44687b06bf429b7be7a04 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Tools: Convert to static type registrationsUlf Hermann2020-02-205-37/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qml and qmltime were still using qmlRegisterType() for some internals. Let's get rid of those. Change-Id: I68c0e7213f3b5b28670364c4db1cdec41d299b7d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Make qtdeclarative compile with -no-feature-tableteventShawn Rutledge2020-02-204-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 8e822e981d91e688799c8670f11dfdf6aaf9e0d1. Fixes: QTBUG-82168 Change-Id: I8d849747a3394ca05d62b674a725d45165f081eb Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * | QV4Engine: Avoid memory leak in toVariant conversionFabian Kosmale2020-02-201-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I2c713fd759ac40aaaac0c0943edb993d3e27686b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Inline component: Avoid even more leaksFabian Kosmale2020-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends d4f3445bb050bbc34f0e86832fca9b7047041c1e Change-Id: I1071577529c2db6937affb3fd3087fec75917e8a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Inline components: do not leak contextFabian Kosmale2020-02-201-1/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic738f3ea8f91cf2ffc7fb86ad9f72c0d630b6de8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Doc: Fix documentation warnings for Qt QMLTopi Reinio2020-02-208-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-82313 Change-Id: I7c2f30411ab8011254d7c232c87cb12a39761bda Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * | Doc: Fix the qmltypes format documentationUlf Hermann2020-02-201-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The case of plain element name without URI is highly atypical and should not be advertised to end users. Also, stress that minor versions and revisions should match and that you should use the QML_* macros to register types. Task-number: QTBUG-81615 Change-Id: I1fd89c708ef8c33cbe44bacb3b37f25661eb3d1e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Doc: Fix imports documentationUlf Hermann2020-02-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We promote QML_ELEMENT and QML_NAMED_ELEMENT() ways to declare types, rather than qmlRegisterType(). Change-Id: I78d64a0ab4412499815da8c0f71bea6dc5dd0b93 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-205-3/+11
| | |\| | | | | | | | | | | | | Change-Id: I024445b3401a57040d7d67780ea32d2f8b02f41a
| | | * QQmlAdaptorModel: Don't const_cast to call release()Ulf Hermann2020-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | release() is const. Change-Id: I00171af75151741e725cd2ceaa80afcaac4f62a3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | | * Doc: list Grid's alignment properties as "since 5.1"Mitch Curtis2020-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were added in 9b801abc3a6967392e27daa35ba7cd802b7164e4 (or 233e83b20512a5e3748542f1c279a5c7ec6310ad, depending on what you ask Gerrit or Git). Change-Id: Ia1c064c04bc3e1a23e6b8caf7d479625368f7fe6 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | * Blacklist tst_qquickmousearea::pressOneAndTapAnother on OpenSuseUlf Hermann2020-02-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-82282 Change-Id: I4794bea023f45b3bdac2f19a68550c7116a49fa2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | | * Fix inverted logicMichael Brasser2020-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A texture has an alpha channel if it is *not* opaque. Change-Id: Ie7fdeb6e622dbb01e19b42877b27f0e0fe8959e2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | | * Windows: Do look for <plugin>d.dll as a fallbackKai Koehne2020-02-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do look for d.dll as name of the library, even if Qt was built in release mode. This mitigates the change we did in Qt 5.14.0, where we switched the way our MinGW builds are configured from -debug-and-release to -debug -force-debug-info. But it is also more consisten in how we handle the release build, and macOS dylib loading. Fixes: QTBUG-81021 Change-Id: I73cd11941d86a732b92a3479d47b6e83a839994f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | ResolvedList: attempt read from correct meta objectFabian Kosmale2020-02-194-5/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-82171 Change-Id: If14b10d703aa1b69cd697024ada2fae0453103d7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
| | * | Avoid memory leaks for inline component typesFabian Kosmale2020-02-192-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a QQmlType is constructed from a QQmlTypePrivate, the latter's refcount is incremented. We decrement it again, as the QQmlType should be its sole owner. Change-Id: Id6ab618e06b49c10e3888c694113536caed7f058 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Fix broken -no-qml-debugAndré Klitzing2020-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4975a33ba9aa357ba2bca93e292b1fbcfb34c24e introduced QQmlDebugTranslationService. If -no-qml-debug is provided the dummy class misses "public:". qml/qqmlbinding.cpp:401:54: error: 'virtual void QQmlDebugTranslationService::foundTranslationBinding(QQmlTranslationBinding*, QObject*, QQmlContextData*)' is private within this context Change-Id: I0f4ebd4d935a17aa7a679d2d87d98d03b0e1fcbb Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * | Doc: Update documentation for "extending" exampleUlf Hermann2020-02-192-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It referred to qmlRegisterType() even though we don't call it anymore. Change-Id: Ib07e4428d032e789d705156ddc4c9589fd797c65 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Fix all import versionsUlf Hermann2020-02-1925-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump all the *.15 versions to QT_VERSION and use QML_IMPORT_VERSION rather than IMPORT_VERSION. Change-Id: I5bfbc960d119a7386bdcedb9bdbfdbfa4486a187 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Add major version to all Q_REVISIONsUlf Hermann2020-02-19154-283/+480
| | | | | | | | | | | | | | | | | | | | Change-Id: Id72fbe10c16de61bd847773d0055d83cfe03f63c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-1914-62/+337
| |\| | | | | | | | | | | | | | Change-Id: Ia15cd13ed7014db80e02ba8b7e0588e3c53f832c
| | * | Fix deprecation warning against QDateTime(QDate)Edward Welbourne2020-02-184-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaba4d9f1ea4b265326a8d1b07573b0f30b4d7428 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| | * | QQmlPropertyCacheCreator: initialize memberFabian Kosmale2020-02-181-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I28f32dd5fd3cf228195a2bdd5df0209646407775 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | QQmlType: Do not dereference pointer if nullFabian Kosmale2020-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can occur when attempting to access invalid attached properties (e.g. tst_qmllanguage/invalidAttachedProperty.6.qml) Change-Id: Id562e2b21fccd8d123a5859d7cc547d098c1ab78 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | * | Doc: Fix extension plugin examples and documentationUlf Hermann2020-02-185-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We advertise the usage of QQmlEngineExtensionPlugin, as registerTypes() should be avoided if possible. The actual source code of the examples already does this, but some of the includes and the documentation was lagging. Task-number: QTBUG-81615 Change-Id: Ibbee60ad55114bf6dc07875080c963e727f49e6b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Remove some dead codeUlf Hermann2020-02-181-5/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I57fed47c0a98d561165d319b93320e0af71c08a3 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| | * | Add documentation for the QML_* macrosUlf Hermann2020-02-172-14/+290
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-81615 Change-Id: Ida02001803230d7daed9352e27689b417f3ac15c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Quick: Don't qualify OpenGL includes (part two)Johan Klokkhammer Helsing2020-02-1837-50/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | QQmlPropertyCache: Don't populate allowed revisions with invalid onesUlf Hermann2020-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d39c9fc792bdb0240bfe12ad020ce4c8bb48454 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-17302-1651/+7880
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/qtqml/plugin.cpp src/qml/qml/qqml.h src/qml/qml/qqmlmetatype.cpp src/qml/qml/qqmlmetatype_p.h src/qml/qml/qqmltypeloader.cpp src/qml/types/qqmlbind.cpp src/quick/items/qquickitemsmodule.cpp tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp Change-Id: I52548938a582cb6510271ed4bc3a9aa0c3c11df6
| | * | Rearrange QQuickPixmapKey operator==Shawn Rutledge2020-02-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to do the comparisons in the same order as the variables are stored. Change-Id: I5faa1daa84757b94993c3135ddfc9a3fd6c10ea6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | MultiPointTouchArea: update the TouchPoint.x and y properties togetherShawn Rutledge2020-02-152-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Letting them change sequentially is inconvenient when they are used to drive some sort of smooth stroke (drawing or motion). Fixes: QTBUG-81944 Change-Id: I46c5948dbec927682244daf00a0df3453a0d92a6 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| | * | V4 Debugger: Properly set up context object for expressionsUlf Hermann2020-02-143-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use the object in question as context object in order to access its properties. Otherwise we can only access the context properties and, incidentally, the root scope's properties. The latter is why the test didn't fail. Fixes: QTBUG-82150 Change-Id: I1f18f9e78dd61786310fd75e0695929522a4c90c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Optimize QQuickPixmapCache readImage() slightlyShawn Rutledge2020-02-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QImageReader::size() twice means calling the image format plugin twice, so it's best to avoid that. Change-Id: I4741e87c7c95252904d0dd9f484a57d953670559 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | TestCase: deprecate mouseDoubleClick()Mitch Curtis2020-02-141-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in favor of mouseDoubleClickSequence(), which has a much more realistic event sequence. mouseDoubleClick() only sends a MouseDoubleClick event, without any press, release, etc. Change-Id: Ifa57cfe678c5f0aef7ee35dab8a1a97ce9a06de0 Fixes: QTBUG-82138 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>