summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove Windows CE vestigesJoerg Bornemann2016-06-028-32/+2
| | | | | | | | Remove every usage of the _WIN32_WCE macro outside of 3rd party source code directories. Change-Id: Ia7e859bd6dcaef10c66674612c8e440f9a2dee56 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Get rid of dead codeLars Knoll2016-05-311-19/+2
| | | | | | | | | | | | QMAKE_SWITCHES (dead/broken since d1c10615e, 2012) and QMAKE_VARS (dead since 389f8b039, 2006) were set, but never used in configure. SUPPORTED was defined but never used since 018aff49cd (2003). Removed dead command line arguments -depths (qws-related, dead since f220f99a6d), -arch, -host-arch (both 921e5193), and -qconfig (710ec5ca). Change-Id: I6bbed56c538cdd74b68432e7fd1e51177f79cc85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove -audio-backend command line optionLars Knoll2016-05-313-34/+2
| | | | | | | | This option hasn't done anything for quite some time, let's get rid of it. Change-Id: Ic6f2830aaf69ba2d054ce21f0d144a61ddf5d06b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove some dead codeLars Knoll2016-05-311-24/+0
| | | | | | | | Remove a code path for a hpux inside a MINGW section when doing the opengl detection. Change-Id: I20b8f7948cd663ec3d6c9dcb891f6fe9a2c9c358 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Properly forward-declare the Apple types with Q_QDOCOlivier Goffart2016-05-315-9/+9
| | | | | | | | | They are needed for the header to be parsed properly with clang based qdoc. While we are at it, change the condition from Q_OS_MAC to Q_OS_DARWIN Change-Id: I2a2f9c1159f47795d9811023d67c86fec1866846 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Remove _bit_scan_{forward,reverse}Erik Verbruggen2016-05-315-94/+144
| | | | | | | | | | Use qCountTrailingZeroBits and qCountLeadingZeroBits from qalgorithms.h instead. Also extended these versions for MSVC. The _bit_scan_* versions stem from a time before the glorious days of qalgorithms.h. A big advantage is that these functions can be used on all platforms. Change-Id: I5a1b886371520310a7fe16e617635ea335046beb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Generate correct output for doubleconversion support in qconfig.priLars Knoll2016-05-311-1/+1
| | | | | | | | | | Setting doubleconversion if Qt is configured with -no-doubleconversion doesn't make sense. This also brings the output of configure and configure.exe in line with each other. Change-Id: I8424cc45b1b69fdb0d074e76868e83544cf5eb38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove checkEvent function no-one usesAlbert Astals Cid2016-05-312-19/+0
| | | | | | | | It was confusing me until i found we have another one so i think it makes sense to remove it if no-one uses it. Change-Id: I49bdb8d795f7617c193c8b62690ee34dc154d2f8 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix unimplemented Mach-O parsing for ARM64 platforms in QPluginLoader.Jake Petroules2016-05-301-0/+3
| | | | | Change-Id: I4853b5ce1691bd84578ebe46af9f73270598387a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert blacklisting of two tests now the fix is inAndy Shaw2016-05-302-3/+0
| | | | | | | | | Revert 6225eff73fdae723a4964deec5e6258d7de962f7 and a8ad67e9398d50171e2136bcd61ee1f155d6dfaf as the proper fix for this is merged. Change-Id: I1c8db99d0efade91fbfd078f7d700c87f3848132 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Clang: remove the QT_NO_RTTI macro declarationThiago Macieira2016-05-291-3/+0
| | | | | | | It's not used anywhere in Qt and this was the only definition. Change-Id: Id69569111e7d4e619e22ffff144daa82a1259cbd Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Remove the Clang __has_feature(cxx_exceptions) checkThiago Macieira2016-05-291-5/+0
| | | | | | | | The check in qglobal.h for __EXCEPTIONS is enough. This check here was causing moc to define QT_NO_EXCEPTIONS Change-Id: Id69569111e7d4e619e22ffff144daa661df4181d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Add some more interesting warnings new in GCC 6Thiago Macieira2016-05-291-0/+2
| | | | | Change-Id: Id69569111e7d4e619e22ffff144c7eee63734794 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Turn off libproxy support by defaultAndy Shaw2016-05-273-4/+4
| | | | | | | | | | | | | | | | | | | | | Since the system proxies are on by default now then we turn off libproxy support by default so that there is no risk of a conflict occurring. For instance on Linux, it is possible that libproxy indirectly causes KDE 4 libraries to be loaded which will cause a conflict with the Qt 5 libraries. Therefore we turn it off by default, since the system proxy setting is the overall better one to have. [ChangeLog][Important Behavior Changes][QtNetwork] libproxy is now turned off by default. Configure with -libproxy in order to enable it again. Task-number: QTBUG-53649 Change-Id: I0c6c5b9091dc2b2b7662fd44f2a1b49c622e563f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org>
* Expose QFileSelectorPrivate::selectionHelper()J-P Nurmi2016-05-272-5/+8
| | | | | | | | Let QQuickStyleSelector in Qt Quick Controls 2 re-use the same selection helper implementation. Change-Id: I34cbba0aa178e342bb4004313e7ff56811e6be19 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Blacklist maskedUpdateMilla Pohjanheimo2016-05-271-0/+1
| | | | | | | | Blacklisting maskedUpdate() to get QtWayland in the CI Task-number: QTBUG-51399 Change-Id: Iabe8db88c7e0b6138cbbf6acab0964d85fdd2c36 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Blacklist tst_qabstracttextdocumentlayout::formatAt on OpenSUSE42.1Milla Pohjanheimo2016-05-271-0/+3
| | | | | | | | | To get QtWayland in the CI, we need to blacklist formatAt on OpenSUSE 42.1 Task-number: QTBUG-52991 Change-Id: I8f411ccd6ab1e1d385e98cd8cae81a5570d68a8f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Blacklist tst_QIODevice::constructing_QTcpSocket on OpenSUSE 42.1Milla Pohjanheimo2016-05-271-0/+2
| | | | | | | | | To get QtWayland in, we need to blacklist constructing_QTcpSocket test Task-number: QTBUG-53662 Change-Id: I056547e74c7a46cf3e97f08399328ab2e684caad Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Blacklisting tst_QTextStream::stillOpenWhenAtEnd() on OpenSUSE 42.1Milla Pohjanheimo2016-05-271-0/+1
| | | | | | | | | To get QtWayland in the CI, we need to blacklist this test Task-number: QTBUG-53665 Change-Id: I55b64a5d7f9444aa5ea73823a60c4cb9c88c31b7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Add QLineF::center() returning the point in the center of the lineLorenz Haas2016-05-273-0/+114
| | | | | | | [ChangeLog][QtCore][QLine/QLineF] Added center(). Change-Id: I6dcfa9e839190c0a4caf36fb6ecd01b37d65d274 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Doc: Fix documentation warnings for QSslDiffieHellmanParametersTopi Reinio2016-05-261-8/+2
| | | | | | | | | | | qssldiffiehellmanparameters.cpp:107: warning: Unknown command '\encoded' qssldiffiehellmanparameters.cpp:131: warning: Unknown command '\device' qssldiffiehellmanparameters.cpp:276: warning: Cannot find 'operator!=(...)' in '\fn' bool QSslDiffieHellmanParameters::operator!=(const QSslDiffieHellmanParameters &other) const Change-Id: Ieb0f27f0c01c799323f4b69b7f2474513c67d443 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Blacklisting tst_qabstractdocumentlayout::imageAt on OpenSUSE 42.1Milla Pohjanheimo2016-05-261-0/+3
| | | | | | | | | We need to blacklist the test since we need to get QtWayland in CI Task-number:QTBUG-53648 Change-Id: Id98c18aa8f39766b5dbb859b085f1912c42339fe Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Fix invalid QDataStream data for QDateTimeThiago Macieira2016-05-261-0/+0
| | | | | | | | | | | | | | The stream in question is from prior to Qt 5.0 release, before commit 718a2251be2d32f96befef1ec23912c1a2ce3e34 changed QDateTime serialization format to store Qt::TimeSpec instead of the private flag. The last byte was 0xff meaning LocalUnknown, but 0xff is not valid in Qt 5.0. It was just garbage that Qt up to now just accepted. With the upcoming short QDateTime optimization, the results are worse. Change-Id: I25d85d86649448d5b2b3fffd1450f57df17e7794 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Squeeze more vectorized rounds out of JSON Latin1String conversion.Erik Verbruggen2016-05-261-2/+2
| | | | | | | | E.g. for a string of length 16, with i == 0, this loop can still run. Same for the case where length is 8. Change-Id: Ie95832b50ddeba2e0dfb0e3308e4c7a5376bb969 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add settable QSslDiffieHellmanParameters for QSslSocket-based servers.Mikkel Krautz2016-05-2517-24/+1082
| | | | | | | | | | Only the OpenSSL backend is supported right now. [ChangeLog][QtNetwork][SSL/TLS support] It is now possible to set custom Diffie-Hellman parameters for QSslSocket-based servers. Change-Id: I50148873132cd0ec7e414250b107b6b4cbde02ea Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Change the system proxies option default to being on.Andy Shaw2016-05-253-4/+4
| | | | | | | | | | | | | | | | | | By changing the system proxies option default to being on, we set it to be the more natural default setting. This is down to the fact that people tend to assume that this is already the default option. [ChangeLog][Important Behavior Changes][QtNetwork] Proxies from system settings will now be used by default. Configure with -no-system-proxies to disable. Change-Id: Iec5bbde9dff1311ce44418f6aa024bda05388cf6 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* QOpenGLFunctions - move assert inside if statementTimur Pocheptsov2016-05-252-48/+72
| | | | | | | | | | | | | | Coverity, CIDs 159312-159335, the same pattern: if (ptr) ptr->refs.deref(); Q_ASSERT(ptr->reds.load()); Coverity does not like (and rightfully so) potentially invalid (null) pointer inside Q_ASSERT. Move Q_ASSERT into if-controlled block-statement. Somehow these CIDs were skipped in the previous similar pass/fix. Change-Id: I56f92d964ec0b59a7fdff066fa7231ddd71fd0d3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* add $$sorted() function.Oswald Buddenhagen2016-05-254-1/+32
| | | | | | | | | | [ChangeLog][qmake] Added $$sorted() function. Change-Id: Ic069d3ef7c0b7a260c714c76eecc71c41417d01f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* add $$str_member() functionOswald Buddenhagen2016-05-254-37/+153
| | | | | | | | | | | | | just like $$member(), but operates on a string value rather than a list variable. it is the swiss army knife of cutting, providing equivalents of left(), right(), mid() and reverse() all in one. [ChangeLog][qmake] Added $$str_member() function. Change-Id: I7c7c6c971db402fff41b428d32a4451f45400728 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* improve the docu of $$member()Oswald Buddenhagen2016-05-251-7/+24
| | | | | | | Change-Id: Id8b43fd7e76f8d3f73ff323a59d1a980bf86c4d3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* add $$str_size() functionOswald Buddenhagen2016-05-253-2/+31
| | | | | | | | | | | | | this is strlen(), but the name is matched to $$size(), just namespaced to reflect that it operates on a string value rather than a list variable. [ChangeLog][qmake] Added $$str_size() function. Change-Id: I56c8b863da244e66bd283257a66b197aa73b0e57 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* add $$num_add() (numeric addition) functionOswald Buddenhagen2016-05-253-2/+89
| | | | | | | | | | | | | | amazing how we managed to do without it for so long. ^^ the name is intentionally somewhat obscure to avoid clashes, and some namespacing is good anyway. [ChangeLog][qmake] Added $$num_add() function. Change-Id: Ib7648b1f425ef096a87b51f158d0f1409e5c4daa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* add $$take_first() and $$take_last() functionsOswald Buddenhagen2016-05-253-3/+90
| | | | | | | | | | | | while implementing stacks and queues was possible before with the help of $$member(), these functions make it much more straight-forward. [ChangeLog][qmake] Added $$take_first() and $$take_last() functions. Change-Id: I4922a5331780e468a42c663c9ad3c6456a95a6bf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* remove remaining pointless conversions to QStringOswald Buddenhagen2016-05-241-27/+24
| | | | | | | | we have perfectly good overloads which work with ProString itself, or at least with QStringRef. Change-Id: I45f39b8c2f83216f20849dd58eb3b8d78726083d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make split_value_list() take a QStringRef as inputOswald Buddenhagen2016-05-243-10/+12
| | | | | | | this also saves some of the cheap but ugly toQString() calls. Change-Id: Iebe644986501db3878306521c76e4ba2c2fb97b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make QMakeParser take a QStringRef as inputOswald Buddenhagen2016-05-249-31/+35
| | | | | | | | | | the only place where this actually saves a deep copy is the evaluation of if(), but as a side effect the parser is now able to deal with not null-terminated strings, which is kinda nice as well. Change-Id: Ib6d08617aa79d2f9eaecd4906d4d548f34bf377d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* make QMakeEvaluator::isActiveConfig() take a QStringRef argumentOswald Buddenhagen2016-05-246-7/+17
| | | | | | | | | | saves some more cheap but pointless conversions to QString. this makes the introduction of the ProStringList::contains(QStringRef) overload necessary. Change-Id: Ic61993bd9a4b28fbba1b8e346345fd5f5636c6f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* add ProStringList::join(ProString) overload and make use of itOswald Buddenhagen2016-05-246-11/+19
| | | | | | | | this introduces an ambiguity, so some char* arguments need explicit QString construction now. Change-Id: Ic3919a1fa9419bbb3b57dd1aa7eb95643ee59e53 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add line feed and carriage return to blacklisted charactersEskil Abrahamsen Blomfeldt2016-05-241-2/+10
| | | | | | | | | | | In order to avoid loading and checking all fonts on the system when the string contains a line separator, we blacklisted it in 98a23b974509bd1b6d9459e6c79677bdcbaa0108 in Qt 4. The same logic applies for paragraph separators, line feeds and carriage returns. Task-number: QTBUG-51934 Change-Id: I121dce17a8ac79b5b790e24c6596438e501e871a Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* ARM: Vectorize common QRgba64 compositing functions.Erik Verbruggen2016-05-242-47/+153
| | | | | | | | | | | | | | | | Adds overloaded functions for some common operations used for compositing, and use those together with specialized loading/storing. QRgba64 is represented as a quint64, so most of the time it lives in the integer registers. By overloading functions to return SIMD data types, the temporary values are kept in SIMD registers (so no more unnecessary transfers between the registers, which can cost a lot on ARM). It also allows the compiler to do better TBAA and optimizations. Another benefit is that the loop bodies are smaller, giving them a higher chance to fit in the micro-op cache of modern CPUs. Change-Id: I5f13cd0677176b1162425fe59d42868d0d20f6e2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Optimize QIconLoader::findIconHelper()John Lindgren2016-05-241-10/+12
| | | | | | | | | | | | Profiling QIconLoader::findIconHelper() shows that a significant portion of CPU time is being spent in QDir::exists(), which creates a new QFileInfo object for the sole purpose of determining whether the passed-in file path is relative or absolute, and then calls QFile::exists(). In this context, we can just as easily generate the absolute path and call QFile::exists() directly, avoiding the creation of extra QDir and QFileInfo objects. Change-Id: Ib0b4568b6c16d423eb6c1b15158e44ff141e6175 Task-number: QTBUG-46767 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QTest: do not generate stack traces when a debugger is attached.Erik Verbruggen2016-05-241-31/+34
| | | | | | | Just leave it to the attached debugger to do it. Change-Id: I65f2676cccec2a074ea31cb8739e1b3fb626a5da Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add applicationDisplayNameChanged() signal.Benjamin Terrier2016-05-243-6/+39
| | | | | | | | | | | | If applicationDisplayName has not been set, the signal is emitted when applicationNameChanged() is emitted. [ChangeLog][QtGui][General] Add QGuiApplication::applicationDisplayNameChanged() signal. Task-number: QTBUG-53076 Change-Id: I18494ad90bd8dec3f79ef5175a3a85e776560fd0 Reviewed-by: David Faure <david.faure@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devLiang Qi2016-05-24224-999/+2058
|\
| * Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-23224-999/+2058
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/wince80colibri-armv7-msvc2012/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/tools/tools.pri src/network/ssl/qsslconfiguration_p.h src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/plugins/platforms/windows/windows.pri src/src.pro src/tools/bootstrap/bootstrap.pro src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/dialogs/qfilesystemmodel.cpp tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5
| | * ANGLE: fixed usage of shared handles for WinRT/WinPhone applicationsOliver Wolff2016-05-203-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | Both checks are not relevant in Qt's context and were skipped before but they sneaked back in with the latest ANGLE update. Change-Id: Ic44de5468a3254afd76ef4804d97d245676daeb1 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * Avoid failing on 64-bit ARMLaszlo Agocs2016-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affects systems like the NVIDIA DRIVE CX. This did not show up so far because there was no error when Q_PROCESSOR_ARM was not set. Task-number: QTBUG-53493 Change-Id: I107155b6dc1a881eca6f57374ad8db4458875243 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-05-19174-640/+1746
| | |\
| | | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-19174-640/+1746
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
| | | | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-1934-46/+200
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/socket/qnativesocketengine_winrt.cpp Change-Id: I8edb72f8ba958d80c3d7993b3feaaae782ca8d9c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 09:12:10 +0000