summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sql: Add a feature for the SQL item modelsUlf Hermann2018-02-2012-3/+39
| | | | | | | | ... and make sure we can build if it's switched off. Change-Id: I9565a2ce632a861a99e1276f3edf4f0d094b5451 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Move duplex member from QPdfPrintEnginePrivate to QCupsPrintEnginePrivateAlbert Astals Cid2018-02-205-11/+12
| | | | | | | | Duplex doesn't really make sense in the context of printing to pdf, and the variable was only being used in QCupsPrintEnginePrivate anyway Change-Id: I801634c56759572825b5c9549d7a1dc92e5697a0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix QPlatformPrintDevice::supportedPageSizeMatchAlbert Astals Cid2018-02-201-0/+4
| | | | | | | | | | First check if the pagesize is one of the known ones before comparing the page sizes. It's veeeery similar but without it when running the qprinter tests i get a failure since we set "Index Card 3x5in" but get back "Photo 3x5in" Change-Id: I72671231c2abec39e036de829d226784f06e1b41 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* ftp backend: Dynamically resolving resource path with URL prefixRyan Chu2018-02-192-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | The code used to retrieve FTP resource with the path of QUrl as an absolute URL starting from the root directory. It is not always working with a relative URL because the root directory and working directory may be different. Depending on the implementation of FTP server, the reference directory of a relative URL could be either the root directory or the working directory. To resolve it, a new state “ResolvingPath” is added to resolve resource paths before retrieving. For both GET and PUT operations supported by QNetworkAccessFtpBackendFactory, the resource will be retrieved via its URL path. Depending on the prefix of the URL path, the path of working directory is prepended to the resource path as an absolute path starting with the working directory. If a URL path starts with “//” or “/%2F” user-input prefix, the resource will be retrieved by an absolute path starting with the root directory. If a path starts with /~/ or the working directory prefix, its resource will be retrieved from the working directory. Task-number: QTBUG-25034 Change-Id: I26198af1c0077f51565afd3f96050235c661f063 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Use QT_CONFIG(stringlistmodel) rather than QT_NO_STRINGLISTMODELUlf Hermann2018-02-192-3/+3
| | | | | Change-Id: Iac5b2cb63d05f1746ca1bf9eba07562d76aa7ba3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Use QT_CONFIG(proxymodel) instead of QT_NO_PROXYMODELUlf Hermann2018-02-193-14/+14
| | | | | Change-Id: Ie01a118b2aa11fcbeaf073ee2d28ceaeffc8a6ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-185-2/+142
|\ | | | | | | Change-Id: I95d8a4ba3d8cedfdda63b99127abb7c57a4265e6
| * Fix compilation with QT_DISABLE_DEPRECATED_BEFORE=0x060000Marcel Krems2018-02-161-0/+2
| | | | | | | | | | | | | | Regression introduced in b254b03dc3b1cfcfc5f17158d2470e0a9a946a0e Change-Id: I77e8718cc6be79d4fbea5510e8d7cc7808a609c2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * Handle unset $DISPLAY variable when using the offscreen platformJan Murawski2018-02-161-2/+6
| | | | | | | | | | | | | | | | | | | | Skip the initialization of a QOffscreenX11GLXContext and thereby fix a null pointer dereference if the environment variable $DISPLAY is unset or contains invalid information. Task-number: QTBUG-66423 Change-Id: Ideea510d1c63a4f6700839955d833cd10e3b0bbe Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| * Fix configure.json (OpenSSL 1.1 on Windows)Timur Pocheptsov2018-02-161-0/+4
| | | | | | | | | | | | | | | | | | Since 1.1 lib names are similar to what they have on other platforms, that is: libssl and libcrypto. Task-number: QTBUG-62733 Change-Id: I477899433719fe36104491601d8cb71004b265ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * mkspecs: Add a win32-clang-g++ mkspec, for clang targeting mingw, like g++Martin Storsjö2018-02-162-0/+130
| | | | | | | | | | Change-Id: I427e46e6c34c2beeb2a815f1af512e4e8bd213c2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add a note to the CLDR-munging scripts about updating the attributionEdward Welbourne2018-02-171-0/+3
| | | | | | | | | | | | | | Change-Id: I9de320d10ddd8947f3f6cf29636e42f08f814a28 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Register QPlatformDialogHelper::ButtonLayoutJ-P Nurmi2018-02-171-0/+1
| | | | | | | | | | | | | | | | | | This allows QML DialogButtonBox in Qt Quick Controls 2 to use the same enum without having to duplicate it. Change-Id: Ib3a89acd18f9e584a203ee44621ca2e3fc0ceaba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QByteArray: Add functions isUpper() and isLower() for Latin1 byte arraysAndre Hartmann2018-02-173-3/+125
| | | | | | | | | | | | | | | | | | [ChangeLog][QtCore][QByteArray] Added QByteArray::isUpper() and QByteArray::isLower() to check if a byte array contains only uppercase or only lowercase Latin1 letters. Change-Id: I7ab3c775bc714138d4be259ac6fa2cfc70467ed4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QTestlib: Add formatting for QFlags<>Friedemann Kleint2018-02-167-2/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | Add formatting for registered enumerations based on QMetaEnum and unregistered enumerations as hex values. [ChangeLog][QtTest] QtTest now prints values of QFlags that failed to compare with QCOMPARE. Task-number: QTBUG-65845 Change-Id: I3eae6d20d3c0d72441ca6c4037d9a8dafa4b6357 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | QPagedPainterDevicePrivate: Remove m_pageLayoutAlbert Astals Cid2018-02-166-99/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having it there is awkward since all the subclasses of QPagedPaintDevice, that is QPdfWriter and QPrinter, have their own m_pageLayout via their private engine classes so we ended up with code like pd->engine->setPageMargins(margins, units); // Set QPagedPaintDevice layout to match the current paint engine layout m_pageLayout = pd->engine->pageLayout(); Now we just use the subclass for it's page layout and all is simpler since we don't need to make sure the two variables are updated to have the same contents. Unfortunately this means that we have to implement a dummy subclass for QPagedPaintDevice(). That constructor doesn't make any sense since QPagedPaintDevice is not really a leaf you want to instantiate, it's there to provide common api for the subclasses and the QPagedPaintDevice(QPagedPaintDevicePrivate *dd) constructor should be used. Since it's a public class we can't remove that constructor and that's why we have that QDummyPagedPaintDevicePrivate. QPageLayout &QPagedPaintDevice::devicePageLayout() is also deprecated now since there's no "device" page layout anymore. Those functions were marked internal and as far as I can see unused outside QPdfWriter/QPrinter so it should be fine. [ChangeLog][QtGui] QPagedPaintDevice constructor has been deprecated since that class is not meant to be used standalone, its two public but internal devicePageLayout() methods are now deprecated. Change-Id: I054601b66afcb7dd662db6247c5ed7820fbee212 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Liang Qi2018-02-16257-1491/+5465
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-16257-1491/+5465
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/tools.pri Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9
| | * xcb: Fix access to shm for X server running from another userAlexander Volkov2018-02-153-35/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ShmCreateSegment call, that was added in MIT-SHM 1.2, to create shared memory segments on the server side. It returns a POSIX shared memory object that is used to mmap memory. It's in effect a file descriptor that is passed through the X server socket and thus avoids permission checks. On the other hand this scheme is more secure, because the file descriptor, and thus the shared memory, are accessible only by the X server and the application. Task-number: QTBUG-46017 Change-Id: I202eead9d01aee2ab5b65f4f74f4c13da7cb2239 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| | * xcb: Enhance SHM management codeAlexander Volkov2018-02-153-44/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - extract the creation of a shared memory segment into a separate function - do extra checks for errors - check that MIT-SHM extension is present once in QXcbConnection Change-Id: I956bdf76b879ec5c95a7ed219a59ae722dc5afba Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| | * qmetatype: add '-bigobj' flag to Windows ICC buildsAlexander Shevchenko2018-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix 'Too many segments for object format' errors for (Debug) builds using Windows ICC. Change-Id: Ie48f43199948477c426d0a4e557f039eda129b22 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * qsettings: add Advapi32 lib to Windows ICC buildsAlexander Shevchenko2018-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix 'unresolved external symbol __imp_Reg*' errors for builds using Windows ICC. Change-Id: I99cb6d53c45cadb31b5675182753f168a7bf4ea3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * fix missing __builtin_mul_overflow for Windows ICCAlexander Shevchenko2018-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Complete 43c44d05ca6af4ec78c1dea84635375a637ff80d to cover builds using Windows ICC. Change-Id: I5f4d62f17b54835a58f3002744574c514cce5e39 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Merge "Merge remote-tracking branch 'origin/5.10' into 5.11" into ↵Liang Qi2018-02-1552-101/+611
| | |\ | | | | | | | | | | | | refs/staging/5.11
| | | * Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1552-101/+611
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
| | | | * QSaveFile: Check for EINTR in fsync()/fdatasync()5.10Thiago Macieira2018-02-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtCore][QSaveFile] Fixed an issue that would cause QSaveFile::commit() to fail if Unix signals were delivered at the same time. Task-number: QTBUG-66268 Change-Id: I3debfc11127e4516b505fffd151148e70662cd5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
| | | | * Set the ellipseDiameters back to the original size in QGraphicsViewAndy Shaw2018-02-084-2/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling setSceneRect() on a QTouchPoint it will cause the ellipseDiameters to be changed, whereas this should not be affected by the scene rectangle as it should be in logical pixels. Also add a manual test for visually checking the ellipse diameters on various devices. Change-Id: I1ee9207cb1a63cfef33fe904594c73aba221af5c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | | * Use the right attribute when checking if shortcuts are shownAndy Shaw2018-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I784965dda64551e6093af817881aa6472d2cc226 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | | | * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-0714-450/+30
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenu.mm Change-Id: I11c5f8466c5b51e13e5ef6a8fc6e3f2dd79122a7
| | | | * | macOS: Share view update code between layered and non-layered modeTor Arne Vestbø2018-02-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8eaf0607c1ede18ed20180fd43cc93744c99962d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | | | * | iOS: Simplify logging of QUIView/QIOSWindowTor Arne Vestbø2018-02-053-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically printing the relationship between the view, platform window, and window, makes it easier to track each object across events. Change-Id: I9fbfaa5c304849ed99dba3b5cd8e7449105d0307 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | | | * | QString: Add whitespace handling note to number conversion functionsAndre Hartmann2018-02-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from QLocale::toFloat and companions. Change-Id: Ic3a13a87cfc1ce34de9dd7d7e7b303ef103c384a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | * | QString: Wrap extra-long comment lineAndre Hartmann2018-02-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77c95e99fd23eb914d7e86ee003d7f487c57f0f0 Reviewed-by: Martin Smith <martin.smith@qt.io>
| | | | * | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵Liang Qi2018-02-045-13/+43
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | refs/staging/5.10
| | | | | * \ Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-025-13/+43
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp Change-Id: Ia28ea4f29d308ba3aa16c2a86ffc57049c6ea590
| | | | * | | | Fix configure.json for opensslv11 featureTimur Pocheptsov2018-02-031-5/+6
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the test/feature had some errors (incorrect "use" and incomplete "condition") + remove "feature". Task-number: QTBUG-62733 Change-Id: If4b8d2fe080d8fba961231834839afadaed0f0c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | | | * | | Merge remote-tracking branch 'origin/5.10.1' into 5.10Liang Qi2018-02-018-39/+74
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibbe355f5e8ef12e5ffeb4e33b6a80760c3e2b464
| | | | | * | | Revert "QVariant: convert QDateTime and QTime to string with milliseconds"Thiago Macieira2018-02-012-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ab1e50757454b5afda2f6dec52d2eb16a32d4798. That was supposed to be a minor behavior change, but ends up having visible effects such as QtXmlPatterns xs:dateTime type now reporting sub-second fractions. So we're reverting in 5.10 and re-applying in 5.11. Change-Id: I741e49459c9a688c1c329d6cbd521cd4a0b2aa84 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | | | | * | | Android: Don't rely on QDir::homePath() to get the application directoryChristian Strømme2018-02-011-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QLoggingRegistry gets called as part of the static initialization phase, it would call into Android's QStandarPaths implementation, which assumed that the HOME env. variable was already set. Since the variable isn't set before main is called, QDir::homePath() returns the root path, which would be cached and always returned. With this fix we now call Android's getFilesDir() directly, which will always return the right path. Since the font locations are also relying on an environment variable being set, we no longer cache that either. Task-number: QTBUG-65820 Change-Id: If45f3d5f0e87b808a62118ae95c31b492885646a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | | | | * | | Android: Defer initialization of logging rules until qApp constructionTor Arne Vestbø2018-02-012-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Android, we load the application library, and its dependencies (Qt), on Android's main thread (thread 0), and then spin up a secondary thread (thread 1), that we call main() on. If any QObject is constructed during loading of the application library or any of Qt's libraries, via static initializers or constructor functions, we will set QCoreApplicationPrivate::theMainThread to thread 0, which will confuse Qt later on when it's being run on thread 1, and will result in a warning during QCoreApplication construction: QApplication was not created in the main() thread This situation can easily lead to a crash as well. Unfortunately logging via qDebug/qCDebug and friends will trigger this too, as they internally use QObject. Fixing the root cause of this is under investigation, but for now we will partially revert fa2a653b3b934783 for Android. The effect is that any qCDebug with a "qt.*" category before qApp construction will turn into a no-op, like it was before fa2a653b3b934783. This patch does not cover the case of a regular qDebug, or a qCDebug with a non-Qt category. Those will still produce the same symptom, as before fa2a653b3b934783. Task-number: QTBUG-65863 Change-Id: I95675731d233244530d0a2a1c82a9578d5599775 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | | | | * | | macOS: Handle update requests via setNeedsDisplay more carefullyTor Arne Vestbø2018-02-013-27/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of trying to detect situations where we need to send a real expose event instead of an update request in response to a drawRect call, we keep track of when we've asked the view to display due to a requestUpdate call, and only deliver the corresponding drawRect as an update request if no other code has asked the view to display. This should cover all cases of asking the view to display, issued from our code or from AppKit, such as the view changing its backing scale factor, or otherwise needing a real expose event. Task-number: QTBUG-65663 Change-Id: I1783787823aee889dad8e48f34a1cb0f1b7b06bd Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | | | * | | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-2911-58/+162
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b40ecee4db13e6329e7a0433b57c5bca473c63f
| | | | * | | | | rasterwindow: End painting on device before ending on backingstoreTor Arne Vestbø2018-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib42de1d7ad0d14e2e2d2ff75606e6cfd7e584c2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | | * | | | | unify windows mkspecs: move angle/vulkan includesAlexander Shevchenko2018-01-272-6/+2
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'win32-icc' toolchain: - remove duplicated angle/vulkan includes. 'win32-g++' toolchain: - place angle/vulkan includes before the unrelated compiler-related variable re-definitions, similarly to the 'win32-clang-msvc', 'win32-icc', and 'win32-msvc' mkspecs. Change-Id: Ie04bc9fb1d51ec0366b42713439f680e51214bbc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | | | * | | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-2614-42/+141
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bfb75083f60190aa1def82d153f89925a92fd56
| | | | * | | | | Fix asserts and crashes in QWinEventNotifier activation loopJoerg Bornemann2018-01-263-9/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backwards iteration was done under the assumption that the only valid modification of the winEventNotifierList in a slot connected to activated() would be the removal of the notifier itself. This is wrong. Instead, iterate forwards, like before 85403d0a, and check the index against the current list size in every iteration. This ensures that we do not run out of bounds while the list is modified. Also, retry the activation loop if the list was modified by a slot connected to activated(). This ensures that all notifiers with signaled handles are activated. Task-number: QTBUG-65940 Change-Id: I25f305463b9234f391abc51fe0628d02f49b6931 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | | | * | | | | Doc: fix wrong link to the example snippet in QApplication classAlexey Safronov2018-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9a1b107dd8d2cd4bf541c3edf19a602fde6356f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | | | * | | | | QVariant: convert QDateTime and QTime to string with millisecondsThiago Macieira2018-01-252-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, it's lossless. Change-Id: I5e421e32396d44e4b39efffd150b744e40fff3a1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | | | * | | | | Update bundled libjpeg-turbo to version 1.5.3André Klitzing2018-01-256-9/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 1.5.3 Change-Id: I8c0caec3c92ba199b1a3baac9a523cc399c8001f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | | * | | | | Fix build of applications on iOSJake Petroules2018-01-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PRODUCT_BUNDLE_IDENTIFIER property was not defined in the Xcode project file and therefore the build would fail. This fixes a regression introduced by 0749ba2c5e. Task-number: QTBUG-65673 Change-Id: I8089b36d86588223ec34859af7388c99a3574d8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 02:59:35 +0000