summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Q_(U)INT64_C is not a type, so don't use it as if it wasMarc Mutz2016-07-062-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These expressions only work because they contain no non-parenthesized commas and an int literal is last. Fix by wrapping only the integer literal in Q_(U)INT64_C. Change-Id: I6b8e508b6c7c022f4b3342f65c26aab89ce17702 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * Fix misleading code in QAbstractSpinBox::event()Marc Mutz2016-07-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A static_cast never returns nullptr unless its argument already was nullptr. But we dereferenced 'event' already by the time we reach this code, so the if is always true. Fix by removing the temporary variable. Change-Id: Ia869d37eda74f0bcdd616e1f57f429cc86e9e525 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * Fix defining QGuiApplication::sync() when QT_NO_SESSIONMANAGER is setOlivier Blin2016-07-061-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync() is unconditionally declared in the QGuiApplication header, but the definition was under QT_NO_SESSIONMANAGER guards. This commit moves the definition of sync() outside of the QT_NO_SESSIONMANAGER guards, since the sync code has nothing to do with session management. [ChangeLog][QtGui][QGuiApplication] Fixed a bug that would cause QGuiApplication::sync() to be left undefined for Qt builds without session management support. Change-Id: Ieb46f7c90c9193e89469126170117d9df672f4cb Task-number: QTBUG-51703 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * Windows: Handle theme switching correctly if a palette is setAndy Shaw2016-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a palette is set on the application object and the user does something to trigger a theme change, i.e. connects via remote desktop or logs out and in again, then it will cause Qt to render incorrectly. Therefore we should only update the palette from the new theme if we don't have our own already set. Task-number: QTBUG-52962 Change-Id: I4e2288efd82ad98b698cc09f26ad188064ec7b2a Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * Testlib: generate_expected_output.py: Run in C localeFriedemann Kleint2016-07-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, float numbers are formatted using a decimal comma in German, causing huge diffs and failures. Change-Id: Icd85a293d0564cac6be244eb0793611920d0c89c Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | | Preserve the scale of fonts when caching the font engineMichael Sheldon2016-07-192-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associates the scalableBitmapFactor with the freetype QFontEngine so that it is preserved when caching the engine Task-number: QTBUG-53652 Change-Id: I010f9d235ccf30679b112e0c05e01bc247a3693f Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | | QStandardItem: enable NRVO for gccAnton Kudryavtsev2016-07-181-4/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I5a5ad039e1df8f040b77ff783a4f0e1213a0f286 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | | Doc: Fix snippet to use initializer listKai Koehne2016-07-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can expect C++11 now, and using an initializer list is much shorter. Change-Id: I6424d24ce7660b342a629e836b94d62c8868a44d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * | | QStandardItem: use reserve() to optimize memory allocationAnton Kudryavtsev2016-07-181-1/+3
| |/ / | | | | | | | | | | | | Change-Id: I09df41f6beaaeecc818f11a01206e9e4583fd93f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Optimize string usageAnton Kudryavtsev2016-07-157-59/+45
| | | | | | | | | | | | | | | | | | | | | | | | Use QStringBuilder more. Use QL1S directly, without QString construction. Change-Id: Iad844391367681fc1013b9725403d009e7c346e6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | QReadWriteLock fast path for tryLock without timeoutOlivier Goffart2016-07-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | When one tries to lock without a timeout, there is no need to allocate a QReadWriteLockPrivate as we will not wait on it. Change-Id: I37c96a7fbc0c66fbdffe372f6089708cb2466fe3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Enable -WX (warnings are errors) for MSVC 2015Thiago Macieira2016-07-151-3/+3
| | | | | | | | | | | | | | | Change-Id: Ib57b52598e2f452985e9fffd1458b565f9bda0f8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Remove (private) QString::expand(), port to (new) QString::resize(int, QChar)Marc Mutz2016-07-142-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot really remove the function, since it's called from inline code (QCharRef::op=(QChar)), but we can schedule it for removal in Qt 6, and inline it into existing in-tree callers. Change-Id: I3499f101dcb5ae908726b3673bf3526a04408db6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Fix the Q_ATOMIC_xxx_IS_www_NATIVE macros with C++11Thiago Macieira2016-07-131-31/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I introduced this code in Qt 5.0, I made INT and POINTER be SOMETIMES_NATIVE, but then later I made the specific sizes be ALWAYS_NATIVE. That doesn't make sense. Instead, use the macros from the C++11 <atomic> header. Note that the member isXxxxNative() functions should not have been constexpr. That's a defect I introduced in Qt 5.0. Task-number: QTBUG-51315 Change-Id: I0c94a5c2846b48c8aea7ffff1436013e8686c153 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Optimize QString::insert()Marc Mutz2016-07-131-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the insertion position is not beyond end(), call resize() instead of expand(), which fills the new size with spaces, which, however would just be overwritten by the following memmove(). Add some Q_UNLIKELY to indicate that we strongly expect the resize() case to be the more common. Change-Id: Iaf3215dd53c2cbd18f2fd8a5f80af8f6844944da Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | configure.exe: Show error on "-target xp" optionOliver Wolff2016-07-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option was removed in dev but should have been removed in 5.7. In order not to complicate merges most of the code that was removed in dev has been kept as is and only the "bare minimum" was removed. Task-number: QTBUG-54674 Change-Id: I5118fe344de014bdcf008cccfe9eca112896d23a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Doc: corrected link to Qt Widgets ExamplesNico Vertriest2016-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | qwidget.cpp:498: warning: Can't link to 'Qt Examples' Change-Id: I5eed4ac4fd5514a1e1ff7130997df8449d5c5e7f Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * | QWindowsOpenGLTester: fall back to built-in blacklist if buglist file cannot ↵Tim Blechmann2016-07-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be resolved if the environment variable is set, but the buglist file cannot be found, we should fall back to the built-in buglist instead of not using any. Change-Id: I370a1f21238efd155b46f0e7071734f5d3c6c343 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Doc: added doc for parameter isMaskNico Vertriest2016-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | Error message: Undocumented parameter 'isMask' in QIcon::setIsMask() Change-Id: If16d232b6856ff6d5104ac7c32d3b8c0ac4081f9 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * | Correct indentation in qsettings.cppThiago Macieira2016-07-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 9c49d8c41158287d4a7b7b9c950512cab692e6c5, despite my pointing out. Change-Id: Ie585843cfb684bc3b6e3fffd14600c99f7fde591 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
| * | QSettings: optimize string usageAnton Kudryavtsev2016-07-091-66/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QStringBuilder and QString::asprintf more. Use += operator to reserve extra capacity for possible free following append/prepend/+= call. Change-Id: Ia534bec28cb96b688a68a5051a855cda1eb5db4b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | Use QStringLiteral more judiciouslyAnton Kudryavtsev2016-07-0826-59/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace it with QL1S in QStringBuilder expressions and in overloaded functions. Replace patterns 'QString::number() + QStringLiteral' and 'QStringLiteral + QString::number()' with QString::asprintf. Saves some text size. Change-Id: Ib39b2332264dfc3df04e77f2c101b47a1030cef4 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Windows QPA: Accept foreign windows when checking for wheel receiversFriedemann Kleint2016-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After change 14efcaa3921687129d4dca9b7d5794668a329cd6, foreign windows no longer have a corresponding QWindowsWindow. This should not block wheel events when checking for blocking modal windows. Amends change 14efcaa3921687129d4dca9b7d5794668a329cd6. Task-number: QTBUG-54430 Change-Id: I1ac87445844946bafc214024e27da08c4f884d79 Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Replace QString::trimmed() with QStringRef::trimmed()Anton Kudryavtsev2016-07-062-7/+7
| | | | | | | | | | | | | | | | | | | | | ... where it's possible. Reduce allocations. Change-Id: I023adfd316f94948fe50749f60bf55748dca56e2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | QDateTimeEdit: de-duplicate calls and cache resultsAnton Kudryavtsev2016-07-061-10/+16
| | | | | | | | | | | | | | | Change-Id: I32162846f5f412c7563e66015ea371f9a1af7748 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | QStorageInfo: update the algorithm for ignored filesystems on UnixThiago Macieira2016-07-061-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the criterion that GNU coreutils' df uses: if the total size of the filesystem is zero, then it's pseudo. After all, if it contains files in a zero-sized volume, it has to be pseudo; if it contains nothing, then it's not very useful anyway. This would have caught most Linux pseudo-fs anyway, but the mount point check beforehand allows us to skip quite a few statfs() syscalls. The new algorithm also solves the following cases which had been mistakenly interpreted: * fuse and ZFS (source devices don't usually start with /) * pseudo-fs that were mounted from a device starting with / (the source device is usually ignored by the OS) This change is not testable automatically. Manual testing shows it still reports the same entries it used to on Linux, plus now shows FUSE (sshfs) mounts. Task-number: QTBUG-54235 Change-Id: Ib57b52598e2f452985e9fffd1459f06dcefcc5c6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Remove support for MSVC < 2013 in ANGLEThiago Macieira2016-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | I'm also removing win32-msvc20xx mkspecs, so this would be dead code. Change-Id: Ib57b52598e2f452985e9fffd1459e59f142c7a39 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | QSslSocket: reset connection parameters on disconnectAlex Trotsenko2016-07-052-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise socketDescriptor(), localPort(), localAddress(), peerPort(), peerAddress(), and peerName() remain uncleared until close() is called. This could take place when the connection is closed by the remote endpoint or the user calls disconnectFromHost(). After disconnecting, connection parameters are no longer valid, while I/O device is still opened and may have pending data for reading. Usually, the user reads all incoming data and closes the device independently. Change-Id: Ic898851c39137faf64019949910f0d94ebb79df7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Timur Pocheptsov2016-07-0533-121/+240
| |\ \
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-0433-121/+240
| | |\| | | | | | | | | | | | | Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
| | | * Replace LLINDEX macro not present on all BSDs with the codeRalf Nolden2016-07-031-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD < 10 doesn't have the LLINDEX macro either in net/if_dl.h, so besides OpenBSD yet another condition to declare the LLINDEX macro for systems where it isn't present does make it more complicated than replacing its usage with the actual code. Change-Id: I7e8ef3e265564526e05ec3115f9fa765d399f045 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * QEventLoop: better describe the exception safety of QtGiuseppe D'Angelo2016-07-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) In general it's unsafe to let exceptions propagate through Qt code, so document that. 2) Add a note that overriding notify() makes sense only in Qt 5, in Qt 6 it's going away. 3) The advice applies also to applications not using QApplication, but just QCoreApplication. Change-Id: I4f6e74c53da757faf2eeaa9de226ceba55c52536 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| | | * Examples: Fix stringification of the Qt versionThiago Macieira2016-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (QT_VERSION % 0xffff00) is useless for now, as QT_VERSION < 0x1000000 (for now). The author of this code probably meant to use bitwise-AND. But even that is unnecessary as the right shift discards the lower 8 bits anyway. Change-Id: Ie585843cfb684bc3b6e3fffd145d533b05288dfc Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | | * Fix build: ftok(3) requires sys/ipc.hThiago Macieira2016-07-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54069 Change-Id: Ib57b52598e2f452985e9fffd1457fa9c7ad3bac0 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| | | * QUrl: Test that we do correctly accept valid schemesThiago Macieira2016-07-022-71/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and reject invalid ones. There was one error: we accepted schemes starting with pluses, dashes and dots. Change-Id: Ie585843cfb684bc3b6e3fffd145cfe12227ec4ad Reviewed-by: David Faure <david.faure@kdab.com>
| | | * Fix the naming of an LLVM tool in common/clang.confThiago Macieira2016-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably was copied from the gcc equivalent. Change-Id: I87e17314d8b24ae983b1fffd14535b9d7f616a1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | | * Allow to drag a QDockWidgetGroupWindow into one of its QDockWidgetOlivier Goffart2016-07-021-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the 2. of QTBUG-52108 Change-Id: Id887f470c7822f6b264d6b739e8658d9809f6609 Task-numer: QTBUG-52108 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * Fix the QMainWindow context menu when there are floating tabsOlivier Goffart2016-07-021-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QMainWindow::GroupedDragging is enabled and there are QDockWidgetGroupWindow, we should still show actions for these QDockWidgets in the context menu Addresses point 4. of QTBUG-52108 Task-number: QTBUG-52108 Change-Id: I11ae401c4fe15e213b0f26e7579634e2062e953c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * xcb: Send also "text/plain" when a "text/uri-list" is dropped.Urs Fleisch2016-07-021-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow dropping of files from Qt applications to applications like Skype, which only accept "text/plain", but not "text/uri-list" or "text/x-moz-url". Task-number: QTBUG-53238 Change-Id: I01bca5c8e20647cedfc9323f542ab07f0cc48658 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Błażej Szczygieł <spaz16@wp.pl> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| | | * QTime: restore Qt3 compatibility in the QDataStream operatorsDavid Faure2016-07-022-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Qt5 program writing a null QTime() using setVersion(QDataStream::Qt_3_3), and then a Qt3 program reading that, would lead to a weird QTime, with isNull=false, isValid=false, hour=1193, minute=2, second=47, ms=295. This commit restores interoperability, by writing out the expected value (0) for a null QTime rather than the -1 value used by Qt4 and Qt5. Change-Id: Icde468a8f6fc9434ef7018296725819b44d672af Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * Doc: Improve QJsonDocument::fromJson documentationKai Koehne2016-07-011-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Be explicit on how to check whether parsing succeeds. Change-Id: I44f408cb6e5a830826b84dfb3a8af331f03e58cc Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | | * Windows: Add support for the PdmDevicePixelRatioScaled metricAndy Shaw2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If65018a86e386a54f40ee12e81b5137e3412d655 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | | * NetBSD: add QMAKE_RPATHDIR for standard QMAKE_LIBDIRRalf Nolden2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetBSD is heavily dependent on using rpath, so we need to add the lib dir QMAKE_LIBDIR and QMAKE_LIBDIR_X11 to QMAKE_RPATHDIR explicitly to avoid linker errors. See http://www.netbsd.org/docs/elf.html for more info. Change-Id: I225143d5e2d9a125060b14e3a8a7953927d63b33 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * QSslSocket: improve documentation of the supported protocolsGiuseppe D'Angelo2016-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) To describe a protocol version we should use an "ordinary" name, not use the values out of the QSsl::SslProtocol enum. 2) Say that we support the latest stable TLS version (1.2, not 1.0). 3) Fix a statement about which protocol is the default one. Change-Id: I18732914d55060a0c3920f7082f986c262a71ded Reviewed-by: André Klitzing <aklitzing@gmail.com> Reviewed-by: Richard J. Moore <rich@kde.org>
| | | * winrt: Set minimum SDK version to 10586Maurice Kalinowski2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10586 reflects Update 1, which is the mininum supported version for many months, hence reflext this in the manifest template as well. There are additional features (like drag and drop) which require and even later SDK version. However, they do not reflect the minimum. Change-Id: I6d71dc499c928ed98c8a25283e0b53994317bb00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | | * nuke dead expandVariableReferences() overload prototypeOswald Buddenhagen2016-06-301-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0c6fceac0b984e4613932b8507a632dd83d0e79b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | | * Fix QLineEdit not showing clear button on macOSFriedemann Kleint2016-06-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore code path returning the resource pixmap for platforms that do not have themes in QCommonStyle. Amends change b657496a0ba326af0688e9935069139c002849cf. Task-number: QTBUG-54425 Change-Id: I764408622b825b86afbe7ccf37e1498d3efb3850 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| | | * QDir: Remove redundant QString wrappingAlexander Volkov2016-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8368b137d15509cdec575a17f5dae3c0c343400f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * QDateTime: early return to make a Q_UNREACHABLE actually true.Edward Welbourne2016-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could be reached when QT_BOOTSTRAPPED was defined. Change-Id: I632d6f908a3bcbde81a6ebbadcaf2800dfe1449d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * winrt: Clean up function signatureMaurice Kalinowski2016-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I006d4a2295103c8e4169945dfb451ee55598ec87 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:57:17 +0000