summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmakeThe Qt Project2019-11-25606-50093/+60391
|\
| * Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-19606-50093/+60391
| |\ | | | | | | | | | Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
| | * Fix two manual tests qmake project filesLeander Beernaert2019-11-132-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes incorrect target name for styles test. Explicit reference of widgets and opengl libraries in dialog.pri. While not necessary for qmake it makes our lives easier when running the CMake conversion script. Change-Id: I036cae9d801c80c5817421b8427fc5c91e2f7883 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Update version checks in tests/manualLeander Beernaert2019-11-1317-54/+18
| | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary version in tests/manual since they are always true in the CMake port where it's impossible to have a QtVersion less than 6.0. Change-Id: I26a13117a8c2e032a9cc70ca0f040122cbf79886 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Remove redundant overloads in QStringFrederik Gladhorn2019-11-133-62/+9
| | | | | | | | | | | | | | | | | | | | | | | | These were added since we couldn't add default parameters in the Qt 5 lifetime. Change-Id: Idf04df78cc7f56c6c1dc1fe6c07e30003350ed0d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
| | * Fix build without features.shortcutTasuku Suzuki2019-11-121-3/+0
| | | | | | | | | | | | | | | | | | Change-Id: I09a1e2e34df6ca1d779a7e36585f70a0d347cde5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Rename some more manual test to be uniqueLeander Beernaert2019-11-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames some of the manual test by prefixing them with tst_manual_ to make sure they are unique in the project structure. This is a requirement for the CMake port. Change-Id: I83e2152826e0f95c3378374ab1c9992412022109 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Fix compile errors related to missing Qt:: namespaceLeander Beernaert2019-11-1112-54/+68
| | | | | | | | | | | | | | | Change-Id: I092a26ef38b08c52d84adb027a1b1bdee8cc7f6b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Rename some manual test to be uniqueLeander Beernaert2019-11-1112-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch renames some of the manual test by prefixing them with tst_manual_ to make sure they are unique in the project structure. This is a requirement for the CMake port. Change-Id: Ie393b125ce5a35b7069cf006db0f3af8c4fda5b4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Remove redundant overloads in QByteArrayFrederik Gladhorn2019-11-063-83/+13
| | | | | | | | | | | | | | | | | | | | | | | | All of these were marked to be removed in Qt 6. Change-Id: Ifa7aa14abebafdfeda024dcbfa5ae1f7874f387f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * QShortcut: Fix build with -no-feature-whatsthisFriedemann Kleint2019-11-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Amenends 89f1f14c5e9a49f25345a65d81b3518d58ecb91a. Task-number: QTBUG-79638 Change-Id: I95c73d5004f234e27967a68d2b770c177fc1ff8d Reviewed-by: Nodir Temirkhodjaev <nodir.temir@gmail.com> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Fix 64-bit integer support in QtJSONAllan Sandfeld Jensen2019-11-058-61/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes parsing writing and pass-through of integers with higher precision than double can handle. Note this adds extra precision compared to JavaScript, but the JSON files read and written this way are still valid, and the extra precision in reading and writing this way is used by many JSON libraries. Fixes: QTBUG-28560 Change-Id: I30b2415c928d1c34c8cb4e4c6218602095e7e8aa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Eradicate Q_FOREACHs over QVarLengthArrayMarc Mutz2019-11-052-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no excuse for copying several KiBs of data just to iterate over it, yet that's exactly what Q_FOREACH does. Besides, this use of Q_FOREACH is being deprecated. In my tree, it's already a hard error. Change-Id: I07240c37626f7d284781e8c4be05eef3c7a54f39 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Fix converting a null QStringRef to QStringSona Kurazyan2019-11-042-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assumption when calling QStringRef::toString() on a null QStringRef (i.e. when QStringRef::isNull() is true) is that QStringRef::toString().isNull() will also return true. With the current implementation we return a null QString() only when the QStringRef references a nullptr QString. We need to do the same also when QStringRef references a QString with null private data. Change-Id: I4177a5ea187ae758d7c46fe76a9d0583140e90cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Get rid of QT_STRICT_ITERATORSLars Knoll2019-11-0424-165/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The concept was a nice idea to avoid accidental detach() calls in implicitly shared containers, but it conflicts with a C++11 compatible API for them, with signatures for modifying methods taking a const_iterator as argument and returning an iterator (e.g. iterator erase(const_iterator)). Change-Id: Ia33124bedbd260774a0a66f49aedd84e19c9971b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-0239-3329/+1845
| | |\ | | | | | | | | | | | | Change-Id: I256a4b0bac4d2f5eb170967fedc4eccaec8c7f2a
| | | * Move the private and internal APIs of QDom to new filesSona Kurazyan2019-11-015-704/+908
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdom.cpp is too big, move the private classes and internal classes to new files to make the maintenance and reviews for the upcoming changes easier. Task-number: QTBUG-76178 Change-Id: Ibe83bf9104e000d405a07653f4278083e2da648e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * QSslSocket - remove old OpenSSL backend (< 1.1)Timur Pocheptsov2019-11-0122-2571/+917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSSL 1.0.2 will stop receiving all support at the end of 2019. Qt 5.15 is our next LTS thus makes sense remove OpenSSL 1.0.2 support there. This also allows us quite a significant cleanup of an old heavily if-defed code and all 'pre11' suffixed source files. [ChangeLog][QtNetwork][SSL] Removed OpenSSL 1.0.x support, now 1.1.x is required Change-Id: I70c70c56cbd8aeff793afe793335696d1b1b7408 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-0112-54/+20
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ic13ef00d76c81295076bb2432576db70ec84fe29
| | | | * 3rd-Party/Double conversion: Fix developer build with MSVCFriedemann Kleint2019-10-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply 72e3d3633e4aca6742a124fb29584d46b63f40ff, which was omitted in 425df43d7fed19866fc7ceb3d26b6cc4190523f5. Task-number: QTBUG-79418 Change-Id: I0afa9ff9ace5bdc6cea103cf2acba6dbf9a64a72 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | | | * Turn a local QHash into a QMultiHashMårten Nordheim2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 972a0402be4d7aed0ebbd0ff56b5018cda01599d was merged before one of its parent patches which changed this QHash into a QMultiHash. So in 5.14 it would overwrite values instead of adding new entries. No idea if it has caused or will cause any regressions. But it was an accident so let's fix it. Amends 972a0402be4d7aed0ebbd0ff56b5018cda01599d. Change-Id: I6623b0b7924024df148d5c83bcbb612f3e595f56 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | | | * Fix text-rendering regression on semi-transparent background on LinuxAllan Sandfeld Jensen2019-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The short-cut for semi-transparent backgrounds has to take precedence over the disabled gamma-correction short-cut. The order got inversed in one function during 5.14 refactoring. Change-Id: I0e54428839428068b602a13eddbf69897ed0797d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | | * Avoid EGL_BAD_MATCH in tst_qrhi autotestLaszlo Agocs2019-10-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call adjustedFormat() as advised by the docs: "Applications are advised to set this format on their QWindow in order to avoid potential BAD_MATCH failures." Task-number: QTBUG-79659 Change-Id: Ibf415fb0ee64bdd3f01d4ba744244bce811c0d27 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | | | * Doc: Remove empty section title from QMilankovicCalendarTopi Reinio2019-10-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01b311cbe67fbb89625beb5a3941a652c9e851ed Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | | | * macOS: Don't skip display link delivery via GCD during live resizingTor Arne Vestbø2019-10-301-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now avoid flushing GL if the exposed size does not match the window size, so we don't need to halt update request delivery during resize. Change-Id: Iaa89e67d50c987757a586b5958e08edf71a5dd0c Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | | | * Doc: Clarify the ownership of a state for addState()Kavindra Palaraja2019-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe498c5288faa478a4dba934bc3c403829b337db Fixes: QTBUG-62445 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| | | | * examples: Fix -Wdeprecated-copy warningsAlbert Astals Cid2019-10-305-39/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples/corelib/tools/customtypesending/window.cpp: In member function ‘void Window::sendMessage()’: examples/corelib/tools/customtypesending/window.cpp:79:71: warning: implicitly-declared ‘Message& Message::operator=(const Message&)’ is deprecated [-Wdeprecated-copy] 79 | thisMessage = Message(editor->toPlainText(), thisMessage.headers()); | ^ In file included from examples/corelib/tools/customtypesending/window.h:55, from examples/corelib/tools/customtypesending/window.cpp:52: examples/corelib/tools/customtypesending/message.h:62:5: note: because ‘Message’ has user-provided ‘Message::Message(const Message&)’ 62 | Message(const Message &other); | ^~~~~~~ examples/corelib/tools/customtypesending/window.cpp: In member function ‘void Window::setMessage(const Message&)’: examples/corelib/tools/customtypesending/window.cpp:87:19: warning: implicitly-declared ‘Message& Message::operator=(const Message&)’ is deprecated [-Wdeprecated-copy] 87 | thisMessage = message; | ^~~~~~~ In file included from examples/corelib/tools/customtypesending/window.h:55, from examples/corelib/tools/customtypesending/window.cpp:52: examples/corelib/tools/customtypesending/message.h:62:5: note: because ‘Message’ has user-provided ‘Message::Message(const Message&)’ 62 | Message(const Message &other); | ^~~~~~~ Change-Id: I563d53f7dd1e0e0dc5fd4db06299b2d0a70c62ff Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * | | Extract QGuiShortcutFriedemann Kleint2019-11-019-255/+659
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtGui] Added QGuiShortcut and made the equivalent existing classes in Qt Widgets derive from them. This provides basic functionality for adding shortcut handling in QML. Fixes: QTBUG-79638 Task-number: QTBUG-76493 Change-Id: I5bbd2c8f192660e93c4690b9f894643275090e4d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * | | QAction: Properly port to the new configure systemFriedemann Kleint2019-11-0124-65/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QT_REQUIRE_CONFIG in the headers of classes to be disabled. Add headers/source files in the .pro file depending on the configure feature in libraries and tests. Add the necessary exclusions and use QT_CONFIG. Only the widgets/kernel tests were made to compile since also the buttons depend on the action feature and it would become too involved. Task-number: QTBUG-69478 Change-Id: Id5bf88bc108f2bbb14dce8625bfdcb7eb0deb8e3 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * | | Split tests of QGuiAction(Group)Friedemann Kleint2019-11-019-348/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-69478 Change-Id: I3f5a4b859f06a0f89b2d344c36b75da4647aedce Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-0164-13672/+27056
| | |\| | | | | | | | | | | | | | | | | Change-Id: I68a6ed3184e62fa89c47c564bb01002c0918d0fd
| | | * | Add a transfer timeout at QNAM level as wellVille Voutilainen2019-10-314-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3443 Change-Id: Idc4d3c9b1ace69bd8b6456506778116a3e8a5490 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | | * | Unify QFSFileEngine implementations on Windows and UnixVolker Hilsheimer2019-10-313-175/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions for standard file system operations simply delegate to the static functions in QFileSystemEngine, which are then implemented separately for each platform. There is no need for the wrappers in QFSFileEngine to be separately implemented as well. The only noticeable difference between Unix and Windows versions was the clearing of the meta data in QFSFileEngine::remove, which was only done on Unix. This is now also done on Windows. As a fly-by fix, correct the (internal only) documentation about case sensitivity. Change-Id: I274b34d5407fdfff2e0a2157bb5220607740a92a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | | * | Update UCD data to Unicode 12.1.0's Revision 24Edward Welbourne2019-10-3031-9261/+21189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Had to teach the update program to accept category Lm as for Joining_Transparent, for the sake of a new ArabicShaping.txt entry. Added three new Unicode versions, several new scripts and a new word-break class. Updated UCD's test data for tst_QTextBoundaryFinder. This left 57 tests failing; I have commented out the data rows for those tests, pending someone with more knowledge addressing this. Task-number: QTBUG-79631 Task-number: QTBUG-79418 Change-Id: Ic33d3b3551195d47a84d98e84020f57a68f0b201 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | * | qmake: Don't call QDir::count() over and overUlf Hermann2019-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be expensive. We don't expect files to be added to the directory while qmake is running, and if that happened, the result would be unpredictable anyway. Change-Id: I5db93132046c1284130bbe51ce1ecd2a14665206 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-3025-4235/+5707
| | | |\| | | | | | | | | | | | | | | | Change-Id: Ib4df563fc7b1f7c40f425e0e71180d9517a672be
| | | | * Make tst_QNumeric more systematic about checking float as well as doubleEdward Welbourne2019-10-291-179/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do this by templating the floating-point tests, which removes some existing duplication as well as avoiding new duplication. Did some renaming in the process. Added some tests of fuzzyCompare that come closer to its boundary. Increased number of tests from 69 to 97. Use std::numeric_limits to replace assorted hard-coded constants and old C-library boundary-value macros. It turns out MSVC's float conflates quiet and signaling NaN (although MinGW's doesn't); and WebAssembly's old fastcomp compiler conflates NaNs for both float and double; so XFAIL the test for distinct NaNs in those cases. Change-Id: I0a1c0d2f68f75d51b8cda9e3ddfe7fa9c190a3e2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
| | | | * Wasm: Fix the markup in wasm_shell.htmlAlessandro Portale2019-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Img width and height are separate tags. Alternatively, they could be defined in the style tag. Change-Id: I0a4a93b63a99a7b644e9096bb9238739f408c0df Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | | | * wasm: add local file access manual testMorten Johan Sørvig2019-10-292-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testes file load and save, computes a sha256 hash for verifying file content. Change-Id: Id7f697c4dfd41e051442350f4050f04b493cfc18 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | | | * qpa: Add note about QScreen taking care of primary screen during removalTor Arne Vestbø2019-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31b4ed6e6597e22172dcca7180750f1392b9ad68 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | | | * Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-10-2911-32/+55
| | | | |\
| | | | | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-2811-32/+55
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/serialization/qjson_p.h Change-Id: I83cea141a4de8b3998478bfded84ca9029f7a2a9
| | | | | | * Drag'n'Drop: fix attached Drag object deleted when DnD is progressingYulong Bai2019-10-274-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attached Drag object's owner, i.e. its parent, is also the dragged item. So the attached Drag object will also be destroyed as the dragged item is deleted. Fixes: QTBUG-65701 Change-Id: I39b0a3180f205c427deed5c70cd1912524f9324e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | | | | * Fix prefix for non-Windows cross-builds on WindowsJoerg Bornemann2019-10-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one specified a prefix "/usr/qt5" on Windows for a non-Windows target (e.g. QNX) that prefix was translated to "C:/usr/qt5" and passed on to the Makefiles, for example as "-Wl,-rpath,C:/usr/qt5/lib". The reason was that we called $$absolute_path on the user-specified prefix. However, absolute_path operates according to the rules of the host operating system. When cross-building, the prefix is an on-device path. Therefore we must not attempt to make it absolute to the build directory. The check whether we're cross-compiling looks a bit arcane, but we cannot use $$qtConfEvaluate(features.cross_compile) at this stage of configure. Instead, we use XSPEC (set up by qtConfOutput_prepareSpec) and $$[QMAKE_SPEC] which is the right host mkspec. Fixes: QTBUG-79214 Change-Id: Id8664f8512cf1d9e178054a38e72323d7929547d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| | | | | | * Tidy up data-stream testEdward Welbourne2019-10-251-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While I was looking into a bug related to problems building the test without GUI, I noticed a lot of spurious #include lines so tidied up a bit. Split some long lines, while I was about it. Change-Id: Id87eb6f612c6b174f8240dfe9c00e0929244fb6c Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
| | | | | | * Exclude tests that need GUI when GUI isn't availableEdward Welbourne2019-10-252-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Dmitriy Purgin for pointing out the serialization one. Task-number: QTBUG-79353 Change-Id: Ia3d750b17ddd8fbb7a83a55df7e4546ca78c358b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | | | | | * tst_qgraphicspixmaptiem: Fix undefined behavior in containsJohan Klokkhammer Helsing2019-10-251-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the comment in the test for details. Change-Id: Ie3d356e476ba0419d304bccd396fc18a831a30cd Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | | | | * Fix a -Wclass-memaccess problem in qjsonVille Voutilainen2019-10-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtbase/src/corelib/serialization/qjson_p.h:230:38: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of type ‘QJsonPrivate::qle_ushort’ {aka ‘class QSpecialInteger<QLittleEndianStorageType<short unsigned int> >’} with ‘private’ member ‘QSpecialInteger<QLittleEndianStorageType<short unsigned int> >::val’ from an array of ‘const class QChar’; use assignment or copy-initialization instead [-Werror=class-memaccess] 230 | str.length()*sizeof(ushort)); | ^ Change-Id: Ie58e7fe4bae3003227364012ad56ab23bd560d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | | | | * qmake: Disallow building Qt examples inside the source treeOliver Wolff2019-10-241-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building examples inside a Qt source tree is considered unsupported. Instead of checking, whether the build is done "in source" inside the source directory, we also have to check for "shadowed example builds" as they are done by Creator. An example would be: qtbase/examples/widgets/widgets/build-wiggly as a shadow build for qtbase/examples/widgets/widgets/wiggly. Fixes: QTBUG-76237 Change-Id: Iceb88af006fad249a4c13fa0b0345cf3f7086252 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | | | | * QColorDialog: Fix memory leak when picking screen colorsFriedemann Kleint2019-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the dialog as parent to the event filter class in QColorDialogPrivate::_q_pickScreenColor(). Fixes: QTBUG-53469 Change-Id: I9110c19a8f49a545a0fbf7cfdb3ded70fea4dcce Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 13:50:54 +0000