summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Turn the available sql drivers into public featuresLars Knoll2016-09-101-9/+9
| | | | | | | | This is required to do the modularization of those features properly. Change-Id: I384aff20274e795aa70483980f0ef25309328800 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Optimize Q_FOREACH for rvaluesMarc Mutz2016-09-091-3/+4
| | | | | | | | | | | | | | | | Add an rvalue overload of the QForeachContainer ctor to allow moving rvalues into the internal container copy. This does not change the semantics of Q_FOREACH. It is just an optimization. Port to NSDMI to minimize code duplication. Costs ~1.3KiB across all libraries and plugins in a QtBase Linux build (optimized GCC 6.1 AMD64). Change-Id: I180e35ecab68aa1d37773b3546787481bb5515a2 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Make blendPixel function generalAllan Sandfeld Jensen2016-09-093-29/+20
| | | | | | | | Moves the blendPixel function from the SSSE3 file and use it more generally, also adds a const_alpha version. Change-Id: Ia29d1ab3879a845d5b65e0610b7836507e33c7ed Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Minor improvements to bilinear filteringAllan Sandfeld Jensen2016-09-091-24/+28
| | | | | | | | Duplicates the improved bounds check for rotated sampling in RGB64, and improves two prologs by using that x1 == x2 during the prolog. Change-Id: I562c5bee12e314c36d3b304f2f72d7635d22d7d4 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* winrt: Make sure that cursor is visible when virtual keyboard is shownOliver Wolff2016-09-075-6/+69
| | | | | | | | | | | | | | | | We have to check whether the cursor is covered by the virtual keyboard when it is shown. If that is the case and the keyboard is snapped to the bottom of the screen the whole content is moved up to ensure the cursors's visibility. WinRT's input context had to be moved from the XAML to the GUI thread as the signal/slot connection does not work otherwise. Signals from QInputMethod were emitted but not handled in QWinRTInputContext as it ran on another thread which did not spin an event loop. Task-number: QTBUG-50291 Change-Id: Id89e970dc194c25ad07ceab14d9fea51bd7388b2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* winrt: Use ComPtrs in input contextOliver Wolff2016-09-071-4/+3
| | | | | | | | By doing so we no longer leak the input pane inside the destructor. Additionally the coding style is closer to the rest of the WinRT port. Change-Id: I0d56086719c98585cec8bc3c4bcb2d86c3ea2e79 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* winrt: Fix build without SSL supportMaurice Kalinowski2016-09-071-0/+2
| | | | | | Task-number: QTBUG-55716 Change-Id: I0c843af7592803362ff2498b102e9264a03b389a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winrt: Differentiate between windows and winrtMaurice Kalinowski2016-09-071-1/+1
| | | | | | | | While there are similarities, we want to keep control over those tests which affect only one platform. Change-Id: Id1f6eb9954169148d70cea14969f34f21d1e6690 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Parse namespaces only for current file, add Q_NAMESPACE support to qmakeBogDan Vatra2016-09-061-1/+2
| | | | | | | Parsing the other files will (re)generate the same metaobject info in two places Change-Id: I8984ed30751a7587de870f55dd427f067d1b2495 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-0519-117/+203
|\ | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt_common.prf src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-0518-97/+173
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/testlib/selftests/generate_expected_output.py Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7
| | * Style sheets: detect and apply font set on QHeaderView sectionPeng Wu2016-09-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Detect and apply style sheets font set when calculating QHeaderView section content size and drawing it. Change-Id: I542cd0d31bbe62f127c509f297eef0a576fec054 Task-number: QTBUG-55597 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * Fix crash when rendering to grayscale8 imagesAllan Sandfeld Jensen2016-09-031-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | An entry was missing in one of the tables. This patch adds it back in and adds the enum comments used to keep track of whether they all are there and correctly set. Change-Id: Ic6a55a8f81f9c42a3174a2a75c80c3a354f173b7 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | * Ensure the fontdatabase is initialized when requesting fallbacksAllan Sandfeld Jensen2016-09-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we will return an empty list of fallbacks if no QFontDatabase has been created yet. Task-number: QTBUG-55222 Change-Id: I50508162fad3206e0acf3cc6eb39aefac5c3e197 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * qcompilerdetection.h: retract Q_COMPILER_DEFAULT_MEMBERS for MSVC < 2015Marc Mutz2016-09-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier versions of the compiler cannot default move special member functions, even though we also define Q_COMPILER_RVALUE_REFS for them. Fix by retracting the less-often-used of the two compiler feature defines. Q_COMPILER_DEFAULT_MEMBERS is not used outside QtBase in neither 5.6 nor 5.7 (5.8 is not released at this time, so wasn't considered). The same is true of the dependent macros Q_COMPILER_DEFAULT_DELETE_MEMBERS and Q_DECL_EQ_DEFAULT. In QtBase, the three uses are: 1. in QAtomic*, where the user also requires Q_COMPILER_CONSTEXPR, which is not defined for any MSVC at this time, 2. for QEnableSharedFromThis, which is a class template with an alternative {} implementa- tion of the default constructor, and uncon- ditional user-defined copy special member functions. 3. The test of the corresponding functionality in tst_compiler, which this commit amends. That means that neither of these two only uses of the macro in Qt libraries are affected by the change. The reason we do this change, then, is that in the future, we want to be able to more easily restore move special member functions for classes for which they are suppressed due to user-defined dtors or copy special member functions. Change-Id: I6f88cad66d6b87a758231f16355c3bddae697b86 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * qstrncpy: don't call strncpy_s with invalid parametersMarc Mutz2016-09-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://msdn.microsoft.com/en-us/library/5dae5d43.aspx, strncpy_s' second argument must not be 0: > If strDest or strSource is NULL, *or numberOfElements is 0*, the > invalid parameter handler is invoked. Move the existing check for len > 0 up to protect the strncpy_s call, too. Change-Id: I70d339ea60d4b76f3038b2e4e4756f6590a9bd31 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * uic: generate translate calls with Q_NULLPTR instead of 0Dyami Caliri2016-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | uic should use Q_NULLPTR instead of 0 as the default disambiguation context. Task-number: QTBUG-45291 Change-Id: I889182c7fe1c4be3336f3cd645aa60838863c633 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Fix unused variable warning on iOSJake Petroules2016-08-311-1/+1
| | | | | | | | | | | | | | | Change-Id: Ieae5d7833b45a49a743a52a437d5383bd8a962c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Windows QPA: Fix leaks in native file dialogsFriedemann Kleint2016-08-301-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release the IShellItem instances according to the documentation of IFile[Open]Dialog. Task-number: QTBUG-55509 Task-number: QTBUG-55459 Change-Id: Ib79622cde21982b1bda0be7d0483c6e652a1d5fe Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * QIcon: Set the pixmap's dpr to 1.0 if the window is also set to 1.0Andy Shaw2016-08-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the pixmap is initially from a higher device pixel ratio and it is being used on a window that does not have a device pixel ratio other than 1.0 set then the pixmap should also have it set to 1.0. This ensures that the size of the pixmap is preserved and it is not scaled down as a result on the normal display. Change-Id: Ie5d96b3e1508867b723000bea182c8157640af02 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * QWin32PrintEngine: Fix uninitialized memory read of dpi_x, dpi_yFriedemann Kleint2016-08-302-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discovered by purify: QWin32PrintEnginePrivate::initialize() called updateMetrics() via updatePageLayout() after initHDC(), so dpi_x, dpi_y were accessed before initialized from the display resolution. Fix by moving the call initHDC() up and giving default values. Change-Id: Ia360c06d156e569ca6b1472ec5b5cdc52948f913 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Guard against calling QWindow::requestUpdate() on non-GUI threadsTor Arne Vestbø2016-08-301-0/+3
| | | | | | | | | | | | | | | | | | Change-Id: I851ff672bc234146deb61615fc7c56df87d62065 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| | * Fix QMainWindow::restoreDockWidget() with GroupedDraggingOlivier Goffart2016-08-304-46/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to account for the fact that the placeholder might be in a floating tab. Task-number: QTBUG-50491 Change-Id: I03d8e49cc40f58691154f5c3984f3b0670a974d5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
| | * Cocoa: Add support for triple-buffered GL contextsTor Arne Vestbø2016-08-292-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | As usual, the requested format may not be available, so clients should check the actual format to confirm triple-buffering. Change-Id: Icf073cc9ddf2c912eb5c3ce0ac80d1694d1c56d7 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | Fix QWindowPrivate::globalPosition() for foreign windowsFriedemann Kleint2016-08-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use mapToGlobal(QPoint(0, 0)) when encountering a foreign window in the parent hierarchy as it is not clear whether it is a native top level or child. In the latter case, using the position is not sufficient. Task-number: QTBUG-43252 Change-Id: I5eebb1f0dbc6a0abbd968c5d383d3eded75c11a5 Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * | QIcon::addFile(): Invoke QMimeDatabase when matching by suffix failsFriedemann Kleint2016-08-301-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will detect image files correctly even if case resource aliases without suffixed are used. Task-number: QTBUG-55388 Change-Id: I337ca1f6be7126fe731e5e278b23aaef6cdfd9ef Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Do not force the default fontconfig configurationAllan Sandfeld Jensen2016-09-042-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since 74cade1ee42dbe15d3242b08d5880e08e6294e2e, QFontconfigDatabase has forced a full init to the default configuration breaking applications that set a custom fontconfig. Change-Id: If9ee3e185c42af10c05ae3852d088881da1d4f1a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | QTextStream: log the defect that op<< uses Latin 1Thiago Macieira2016-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of Qt, including the QString constructor, uses UTF-8 to interpret narrow character literals. The fact that QTextStream uses Latin 1 should be considered a defect. We can't fix this in Qt 5, so log it for consideration in Qt 6. Change-Id: I9e96ecd4f6aa4ff0ae08fffd14710fa61673db57 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Replace QLatin1Literal with QLatin1StringAnton Kudryavtsev2016-09-034-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLatin1Literal is just alias of QLatin1String for Qt4 compatibility. So it's style cleanup patch. Change-Id: Ia3b3e5dc3169f13a1ef819d69be576b8a8bfb258 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Remove the ability to build simulator/device targets from SUBDIRS projectsJake Petroules2016-09-031-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done because a followup patch will cause simulator_and_device builds to no longer use exclusive builds and so this feature could not work, but it is not strictly necessary anyways because users do not need to be able to do this. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: If869fbfea776751553c352c2d652edf745a3638d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | tuiotouch: clean upMarc Mutz2016-09-038-58/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - order includes from most specific to most general - include only what you need - port uses of inefficient QLists to QVector (required adding default ctors to the payload types) - mark types as Q_MOVABLE_TYPE - inline some trivial functions - add explicit to ctors - mark plugin with QT_NO_FOREACH Change-Id: I7ae13141ece22bfdf49be42deb0987d51da2d72b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | bearer plugins: eradicate Java-style iterators and Q_FOREACHMarc Mutz2016-09-025-66/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the simple part of the job, removing Q_FOREACH loops which are obviously safe to be replaced by C++11 range-for. In QNetworkManagerEngine::sessionStateForId(), instead of iterating over QHash::keys(), iterate over the QHash directly (using C++11 range-for, as we're only using the values, not the keys). In QNetworkManagerEngine::connectToId(), simplify the loop body by merging three identical if blocks into one. Saves ~1.7KiB accumulated over the three Linux bearer plugins: connman, generic, nm (optimized GCC 6.1 Linux AMD64 build). Change-Id: Ic66139c25f7e2173f5a919927e269b873334d2c8 Reviewed-by: Lorn Potter <lorn.potter@canonical.com>
* | | QTest: allow to mark QFETCH variables constMarc Mutz2016-09-011-5/+5
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtTest] QFETCH variables can now be declared const (QFETCH(const T, name)). Change-Id: I7cc1e4568d7082f27f90d8b5abf53ffafb1c48c7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QColor: move contents of qcolor_p.cpp into qcolor.cppMarc Mutz2016-09-013-370/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions defined there are used almost exclusively in qcolor.cpp, so give the compiler the whole picture. Also fixes the non-standard naming of the files: qcolor_p.h should have been qcolor_p_p.h, since it declared functions defined in qcolor_p.cpp. Change-Id: I06e61232a906fd0d98d5adcfe4af5881985367d8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QNetworkProxy: Remove calls to deprecated API on macOSGabriel de Dietrich2016-08-311-46/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFURLCreateDataAndPropertiesFromResource has been deprecated since 10.9. Instead of loading the PAC file contents, we call CFNetworkExecuteProxyAutoConfigurationURL. This function being asynchronous, we make sure we block until the CFProxyAutoConfigurationResultCallback has been invoked. Change-Id: I97e32d7f9b349e8e15fe1fdcb35b10e7aab39b3a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | QLockFile::tryLock: prevent over-sleeping in certain casesThiago Macieira2016-08-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sleep time increases exponentially, but we never checked whether the time to sleep was less than the remaining time. For example, if timeout was 4000 ms on entry, we'd progressively sleep 100 ms, 200, 400, 800, 1600 ms. At this point, the accummulated sleep time would be 3100 ms and the next sleep should be no more than 900 ms. Prior to this change, the tryLock() would then proceed to sleep 3200 ms, for a total wait time of 6300 ms, or 57.5% above the timeout provided by the user. Change-Id: Ifc295639c8cf4ddcaa69fffd146f7586a7ee95e4 Reviewed-by: David Faure <david.faure@kdab.com>
* | | QLockFile: Use QDeadlineTimer in tryLockThiago Macieira2016-08-301-5/+3
| | | | | | | | | | | | | | | | | | | | | This simplifies the code a bit. Change-Id: Ifc295639c8cf4ddcaa69fffd146f7535d646cb15 Reviewed-by: David Faure <david.faure@kdab.com>
* | | QDeadlineTimer: inline the isForever functionThiago Macieira2016-08-302-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | The constructor that sets it is inline already, so there's no point in hiding this. Change-Id: I66707fdfe8eb460a9c72fffd146d8dbc35b13056 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | uic: prune unused includesOswald Buddenhagen2016-08-302-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | incidentally, this helps with building in feature-reduced configurations. Change-Id: I2f523cff92985539383970e137df12d86c20a626 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | uic: use QStringList::removeDuplicates()Marc Mutz2016-08-302-9/+1
| | | | | | | | | | | | | | | | | | | | | ... instead of rolling our own version. Change-Id: Ibd29f233844a6283349d086c4fbc88d7e1087653 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Optimize the simple QImage flip used by OpenGLAllan Sandfeld Jensen2016-08-301-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vertical mirror is simple enough it can be done by memcpy most of the time, and is commonly used when bridging raster and OpenGL. This patch adds a simple optimized function for QImage flipping. Change-Id: I83a0192fc150576dcf573895cdaecb17b0ed72a5 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | | QSettings: Remove calls to deprecated API on macOSGabriel de Dietrich2016-08-304-73/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFURLCreateDataAndPropertiesFromResource and CFURLWriteDataAndPropertiestoResource have been deprecated since 10.9. We replace them with simple QFile access. Code cleaning and included. Change-Id: I19c7ceac41c8c511962f1128bd8e210e3adb434c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | QtPlatformSupport: Restrict usage of DBus for menu/tray icons to UnixFriedemann Kleint2016-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, there is a needless dependency on DBus on Windows. Change-Id: I6ef9ec41a74c2f864dddf78abede205493eae5b3 Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Fix bundled xkbcommon build without xcb-xkb presentLaszlo Agocs2016-08-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The condition went missing in the process of cleaning up. Change-Id: If4f7958e5e5983c86f86a009aaa88d1f5e7ec76d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-08-29127-3981/+4971
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf53aa21bf0f8fbd13c0ce2d33ddf7bc63d0d76a and 3aaa5d6b32130d3eeac872a59a5a44bfb20dfd4a were reverted because of reconstruction in 5.7. defineTest(qtConfTest_checkCompiler) in configure.pri is smart enough to cover the case in a9474d1260a8c8cc9eae14f2984098919d9684e5. DirectWrite: Fix advances being scaled to 0 Since 131eee5cd, the stretch of a font can be 0, meaning "whatever the font provides". In combination with ec7fee96, this would cause advances in the DirectWrite engine to be scaled to 0, causing the QRawFont test to fail. Conflicts: configure mkspecs/features/uikit/device_destinations.sh mkspecs/features/uikit/xcodebuild.mk src/corelib/global/qglobal.cpp src/corelib/global/qnamespace.qdoc src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/windows/qwindowsservices.cpp src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp src/widgets/kernel/qapplication.cpp tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-2913-22/+45
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/plugins/platforms/winrt/qwinrtclipboard.cpp Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9
| | * QTextDocument: fix string backward searchSamuel Gaist2016-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtGui][QTextDocument] Fixed a bug that would return a wrong position when searching backward from the end of the document. Task-number: QTBUG-48182 Change-Id: I6e88f808a50cb840f61e7bc579e2a28c5300089d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * QColorDialog::getRgba: Fixed ignoring of initial alpha valueThorbjørn Lindeijer2016-08-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for this method explicitly states that the initial color+alpha is used, but its implementation used a QColor constructor that ignores the alpha value. Change-Id: I71721386e7fae0761e079d8840ec0124a8c14e33 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
| | * QAbstractSpinBox: Clear 'cleared' flag on receiving a keypressFriedemann Kleint2016-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent QAbstractSpinBoxPrivate::interpret() from bailing out in focus changes after text has been entered. Task-number: QTBUG-55249 Change-Id: I250b3c50f7db5de2e9356038df20f18ee059df11 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * winrt: avoid duplicate signal emitMaurice Kalinowski2016-08-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | emitChanged() will be invoked when the system notifies the application about a clipboard change. Hence, there is no need to call it previously and cause two signals on the same change to be emitted. Change-Id: I99605c9a71054e0610006dbeaaa90c5fb2f46755 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 18:07:35 +0000