summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* headersclean: s/QT_USE_FAST_CONCATENATION/QT_USE_QSTRINGBUILDERSérgio Martins2015-10-191-1/+1
| | | | | | | The former is meaningless nowadays. Change-Id: I27c7eb0e924f3f2e9b73185f1b198909aeb6b031 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix avx512 feature testLouai Al-Khanji2015-10-191-1/+1
| | | | | | | | | The check was broken on non-bash and producing errors like this: /home/louai/work/qt5/qtbase/configure: 4528: [: Illegal number: Change-Id: I5e78ad002cd7cfb401f2646510e0923f77c55f98 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Compile qmake and configure.exe in C++11 modeThiago Macieira2015-10-183-3/+4
| | | | | | | | | Since the Qt headers require them now, we need to ensure that happens properly. Change-Id: Ib306f8f647014b399b87ffff13f14196c2c75bef Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update mkspecs to use "c++11" instead of "c++0x"Thiago Macieira2015-10-184-7/+7
| | | | | | | | We no longer support any compilers that don't know the actual version number of the standard. Change-Id: Ib056b47dde3341ef9a52ffff13ef154791dd0d22 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QMetaObjectBuilder: replace index-based for loops with C++11 range-forMarc Mutz2015-10-171-139/+123
| | | | | | | | | | | | | | ...for the recently-introduced std::vector objects (QVector would detach). Also, as a drive-by, reorder two comparisons so the cheaper one is first, twice. Saves 1700B of text size on GCC 4.9 optimized C++11 AMD64 Linux builds. Change-Id: I05a29ef1f2e67c98d26236c2cc40a13856a91af6 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Android: Update splash screen in onConfigurationChangedDaiwei Li2015-10-162-0/+20
| | | | | | | | | When the device orientation changes, we should set the background to a drawable appropriate for that orientation. Task-number: QTBUG-44238 Change-Id: I4ea50aedc704060c0b35c2d35b75cbaed3b4979a Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Add the QT_HAS_xxx macros for post-C++11 feature testingThiago Macieira2015-10-164-24/+39
| | | | | | | | And for compiler extensions. QT_HAS_BUILTIN and QT_HAS_ATTRIBUTE will come in handy. Change-Id: I255870833a024a36adf6ffff13ecf06624bfc1ef Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Add QNetworkInterface::interface{IndexFromName,NameFromIndex}Thiago Macieira2015-10-1510-40/+167
| | | | | | | | | | These are for faster lookups between ID and name when one doesn't need the full information set about the interface. Change-Id: I7de033f80b0e4431b7f1ffff13f98d448a705c3e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add processor types to blacklist keywordsRainer Keller2015-10-151-0/+7
| | | | | | | This allows to disable tests that do not work on ARM machines. Change-Id: I80b54da2978479e037b73ca3af87567e8d9d1b60 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QIODevice::seek(): remove unnecessary checkAlex Trotsenko2015-10-151-1/+1
| | | | | | | | At this point, the buffer is always not empty, as otherwise the offset could not be smaller than it. Change-Id: Iec04c0463623c4ed1e86bbcba2240653f110e315 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-14591-3533/+6469
|\ | | | | | | | | | | | | | | | | Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
| * Windows: Open GL blacklist - Add add intel hd graphics 3000 devicesTim Blechmann2015-10-141-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the windows driver for Intel HD Graphics 3000 is buggy (crashes on initialization) and according to intel, this driver won't receive any bugfixes. device IDs taken from http://www.pcidatabase.com/search.php?device_search_str=graphics Task-number: QTBUG-42240 Change-Id: Ib846d37f67d901060d1318f3f211a5e5dc4f6814 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com> Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Separate KMS and GBM testsLaszlo Agocs2015-10-146-28/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KMS is no longer a platform plugin so the relevant leftover bits are now removed. As the introduction of the EGLDevice-based backend for eglfs shows, using DRM/KMS is not tied to GBM, separate buffer management approaches, like EGLStreams, work fine as well. Therefore separate KMS from GBM and remove the EGL and GLES dependency in the tests - this way there is nothing preventing us from using GBM without GL for example. Change-Id: Id7ebe172b44b315f9a637892237d2bb62d99aed2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| * Add support for the Jetson TK1 Pro using EGLDeviceLaszlo Agocs2015-10-1411-1/+823
| | | | | | | | | | | | | | | | | | | | | | For now we pick one crtc and find the corresponding layer. If this is not desired, set QT_QPA_EGLFS_LAYER_INDEX to override the layer to be used. Enable qt.qpa.eglfs.kms to get logs about the available layers. Change-Id: I762783f960739e32966c8cde17d8f55fbe40091f Done-with: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| * QOpenGLWidget: Fix grabbing multisample framebuffersLaszlo Agocs2015-10-141-2/+13
| | | | | | | | | | | | | | Task-number: QTBUG-48450 Change-Id: I0a680e0d682c7c08c3aea40d922bbf2ad66c1de0 Reviewed-by: Joni Poikelin <joni.poikelin@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * QOpenGLWidget: Do not recurse when calling grabFramebuffer() from paintGL()Laszlo Agocs2015-10-141-2/+8
| | | | | | | | | | | | Task-number: QTBUG-48450 Change-Id: I14b1ff40727f705d8b89371b4d3bb5d6adc139fe Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2015-10-1419-93/+450
| |\
| | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-1319-93/+450
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/socket/qabstractsocket.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp src/sql/drivers/mysql/qsql_mysql.cpp Change-Id: Ifb73623d09f53340ee5e10283f1f86b580998902
| | | * Fix gstreamer configuration test.Yoann Lopes2015-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use gst_is_initialized(). It was added in 0.10.31, but we don't actually require that version. Change-Id: If5d662e18511cf636861bf93eeccc1f5b69e26f1 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| | | * Merge "Merge remote-tracking branch 'origin/5.5.1' into 5.5" into ↵Liang Qi2015-10-1310-67/+348
| | | |\ | | | | | | | | | | | | | | | refs/staging/5.5
| | | | * Merge remote-tracking branch 'origin/5.5.1' into 5.5Liang Qi2015-10-1310-67/+348
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I2942591e1c1ca86ce0f6476e0a5c3033cdf861ee
| | | | | * Fix spurious socket notifications on OS X and iOSv5.5.1Alex Trotsenko2015-10-092-38/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Core Foundation Framework forwards notifications about socket activity through a callback function which called from the run loop. The default behavior of Core Foundation is to automatically re-enable the read callback after each notification, and we explicitly enabled the same behavior for the write callback. With this behavior, if the client did multiple recv() calls in response to the first notification in a series of read notifications, the client would still get the QSocketNotifier notifications for the data that was already read. To get rid of these extra notifications, we disable automatically re-enabling the callbacks, and then manually enable them on each run loop pass. Task-number: QTBUG-48556 Change-Id: I0b060222b787f45600be0cb7da85d04aef415e57 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | | | | * Revert "Fix the spurious socket notifications on OS X"Alex Trotsenko2015-10-063-42/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8e0f7cfc638a71770f44ada828ff2cf6d2ee201. Needs a more testing. Change-Id: Iff0b2741922cfa8f16fbc3f4ce0f83869d6cd8b6 Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| | | | | * ANGLE: Fix D3D feature level detection.Samuel Nevala2015-10-022-41/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7943d4f tried to fix this with a switch/case, but the feature levels need to be in descending order so this failed. So, follow the same style used for feature levels 10/11. Change-Id: Ia1c22981bf8b99eb53df13833aba452482398295 Task-number: QTBUG-38481 Task-number: QTBUG-48571 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| | | | | * Fix the spurious socket notifications on OS XAlex Trotsenko2015-10-023-12/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Core Foundation Framework forwards notifications about socket activity through a callback function which called from the run loop. Previous implementation sets kCFSocketReadCallBack, kCFSocketWriteCallBack to be automatically re-enabled after they are triggered. With these semantics, an application need not read all available data in response to a read notification: a single recv in response to each read notification is appropriate. If an application issues multiple recv calls in response to a single notification, it can receive spurious notifications. To solve this issue, this patch disables automatically reenabling callback feature. Now, callback gets called exactly once, and is not called again until manually re-enabled by calling CFSocketEnableCallBacks() just before entering to wait for the new events. Task-number: QTBUG-48556 Change-Id: Ia3393c2026230c7b3397cc614758dec1d432535f Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
| | | | | * ANGLE: Fix Windows Store D3D Trim and Level 9 requirementsAndrew Knight2015-09-294-3/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to additional validation not covered in previous patches, the Windows Store certification compatibility had regressed. These changes ensure that the required D3D behaviors are met. Change-Id: I0a74f0d2fecaa87d4a9409da3a7a194254609759 Task-number: QTBUG-38481 Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | | | | * Update the Qt 5.5.1 changelog for qtbaseThiago Macieira2015-09-231-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I42e7ef1a481840699a8dffff1405e4154dd6b5dc Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | | | | * ICC on Windows: Disable ref-qualified member functions in MSVC <= 2013Thiago Macieira2015-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like MSVC, ICC on Windows in debug mode always makes calls to dllexported functions instead of inlining them. Since MSVC 2013 doesn't know about ref-qualification of member functions, this creates an incompatibility between DLL creation and DLL use. Task-number: QTBUG-48349 Change-Id: I42e7ef1a481840699a8dffff14053b594810fb42 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | | | | * buildsystem changelog for 5.5.1Oswald Buddenhagen2015-09-161-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I310f9eff657e9730830cd5c302bdfc46fe67febc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | | | | * Fix QMYSQL plugin database connection setup checkSamuel Gaist2015-09-151-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening a connection to an e.g. inactive server will return true regardless of the server accessibility. This patch aims to fix the current checks done. The first one is an allocation check which should only fail if there's not enough memory but is currently wrote as if the connection failed there. The second check that is "failing" is the connection setup. The return value should either be NULL or the same value provided as first parameter. That is now verified. [ChangeLog][QtSql][QSqlDatabase] Fixed a bug where opening a connection to a MySQL database using the QMYSQL plugin would always return true even if the server was unreachable. This bug could also lead to crashes depending on the platform used. Task-number: QTBUG-47784 Task-number: QTBUG-47452 Change-Id: I91651684b5a342eaa7305473e26d8371b35396c4 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| | | | | * Revert "Cocoa: correct QDesktopWidget::availableGeometry()"Liang Qi2015-09-151-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrong calculation of flip. This reverts commit 1a5cc2a868969f1b1e9278c4145b7af2fc4b8f69. Task-number: QTBUG-47030 Change-Id: Ide178eb5e027c4ecec1e3952c973fb64987eb7ce Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
| | | | | * Merge 5.5 into 5.5.1Oswald Buddenhagen2015-09-1183-291/+903
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff
| | | | | * | Add Qt 5.5.1 changelog with updated 5.7 future direction noticeThiago Macieira2015-09-111-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should carry this in all 5.5.x and 5.6.x releases, to make sure everyone gets the message. But for this release, we need to note the changes from what was announced for 5.5.0: Clang 3.2 cannot compile std::atomic properly, so it will not be supported. That means the minimum XCode version we'll require will be 5.1, which fortunately does not raise the minimum OS X version that can compile Qt. See http://llvm.org/bugs/show_bug.cgi?id=12670 for more information. ICC 14.x and 15.x on Windows miscompiles pointer-to-members across DLL boundaries, so signal-slot connections fail. See QTBUG-40281. Change-Id: I42e7ef1a481840699a8dffff1400a4377fcf4589 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | | * | | | QAbstractSocket: fix writing to socket in HostLookup stateAlex Trotsenko2015-10-132-4/+18
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After calling connectToHost(), the socket enters HostLookup state. At this stage, the socket engine was not created yet, and writing to the socket should result in either data buffering or an error. So, add a check for d->socketEngine to prevent a crash on unbuffered sockets. Task-number: QTBUG-48356 Change-Id: I15ea9ce7de97ce6d7e13e358eca5350745b556bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Richard J. Moore <rich@kde.org>
| | | * | | QLockFile: fix errno handlingGiuseppe D'Angelo2015-10-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a lock failure, we potentially pollute the errno value before printing it. Also, switch to qt_error_string, as strerror is not reentrant. Change-Id: I952aac14204637155726bcefc0ed8a21d7fcd501 Reviewed-by: David Faure <david.faure@kdab.com>
| | | * | | QListView: Use correct available size when calculating scrollbars.Christoph Schleifenbaum2015-10-122-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculation was working as long as one didn't use per pixel scrolling. Task-number: QTBUG-48579 Change-Id: Ie02e28b008c5c81ed45d7dd17fed96148c23b598 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: David Faure <david.faure@kdab.com>
| | | * | | Offscreen: Protect against the QT_NO_CURSOR define for changeCursorAndy Shaw2015-10-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_NO_CURSOR is defined then changeCursor() is not implemented in QPlatformCursor which means that it isn't really being overridden in the offscreen plugin. Therefore the same define is checked for to prevent a compiler from having a problem with it. Change-Id: Id7c104292354cb7462b3161602fc8d382a6dd390 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | | * | | QDebug: add missing docs for op<<(Container)Marc Mutz2015-10-072-8/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f89d8e792bf0d432a0b2522f26026c6ad81e2f4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * | | Doc: remove unused code from OpenGL Window exampleSamuel Gaist2015-10-071-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb2c7206dee55102eba91b4c30543f3ac4838259 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | | | | eglfs: Handle custom platform window implementations betterLaszlo Agocs2015-10-1411-34/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backends may want to subclass QEglFSWindow and reimplement resetSurface() and similar. Make it possible to do this by moving window creation to the device integration interface, similarly to screens. In addition to customizing the windows, some backends may want to disable the dependency on surfaceless contexts when using offscreen windows (i.e. pbuffer surfaces). Make this possible too. Change-Id: Ic5a426e07f821c7a800217b8799f91770ba6a6d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| * | | | | Make the CoreFoundation event dispatcher depend on QtCore onlyMorten Johan Sørvig2015-10-134-22/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In anticipation of moving it to QtCore. The call to QWindowSystemInterface::sendWindowSystemEvents() has been moved to QIOSEventDispatcher by making processPostedEvents() virtual. Change-Id: I9e03be4153a9f5f34e9a0ac942cdff572a44c318 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * | | | QLinkedList/QSet: add {const_,}reverse_iterator, {c,}r{begin,end}()Marc Mutz2015-10-136-12/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now all Qt sequential containers consistently provide reverse iterators. The associative ones, by way of not returning std::pair from op*, can't just use std::reverse_iterator. They would miss .key() and .value() methods. So that has to wait for 5.7. The reverse versions of the new key_iterators can also just use std::reverse_iterator, but I'm afraid that after bikeshedding over keyRBegin() vs. rKeyBegin() vs. reverseKeyBegin() vs. rkbegin() vs. krbegin() (<-- of course, what else?), it would anyway be too late for 5.6, so defer, too. [ChangeLog][QtCore][QLinkedList/QSet] Added rbegin(), crbegin(), rend(), crend(), and reverse_iterator and const_reverse_iterator typedefs. Task-number: QTBUG-25919 Change-Id: I58316fffade469e9a42c61d7aa1455ae3443fd94 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * | | | Don't let closed http sockets pass as valid connectionsUlf Hermann2015-10-132-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A QAbstractSocket can be close()'d at any time, independently of its current connection state. being closed means that we cannot use it to read or write data, but internally it might still have some data to send or receive, for example to an http server. We can even get a connected() signal after close()'ing the socket. We need to catch this condition and mark any pending data not yet written to the socket for resending. Task-number: QTBUG-48326 Change-Id: I6f61c35f2c567f2a138f8cfe9ade7fd1ec039be6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | | | Testlib: Output function / total time along with crash dump.Friedemann Kleint2015-10-137-18/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only QXmlTestLogger had timers to take elapsed times and log them. Move those into class QTestLog for access by the loggers and output the times in the crash dump to make it easier to spot hangs/recursion crashes. Produces: QFATAL : foo() Received signal 11 Function time: 22ms Total time: 23ms A crash occurred in ... Function time: 24ms Total time: 26ms Task-number: QTBUG-47370 Change-Id: Ia530a63104087daffc9a15f68c15d93378b9407e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | | | Libraries: Fix single-character string literals.Friedemann Kleint2015-10-1344-81/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I8e198774c2247c1cc1d852a41b59b301199b7878 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * | | | Examples/Doc snippets: Fix single-character string literals.Friedemann Kleint2015-10-1334-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I79fa5018f05735201ae35ee94ba0d356fcad1056 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | | | qdoc: Improve formatting of function signaturesTopi Reinio2015-10-133-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a continuation of the work started in commit 694d30035593addc377fea374d1dbe8e3f5ca503. Attach reference ('&') and pointer ('*') qualifiers to the parameter name, as per Qt coding style. Previously, function signatures were documented like this: QString & QString::append(const QString & str) After this change, they will appear like this: QString &QString::append(const QString &str) Change-Id: Ie103fc2929635bc32145e50469c600f9f378f97c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | | | qdoc: Insert targets for function and enum nodes read from the indexTopi Reinio2015-10-132-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc wrote \target and \keyword information into the index file properly, but did not read them back in. This was because the code for handling enum and function elements read their own child elements (without handling targets), and marked the remaining children to be skipped. This commit fixes the issue by refactoring the code for inserting targets into a new function and calling it from relevant places. Change-Id: I85d7b26ce54620daec35b19e447d1a065515b863 Task-number: QTBUG-48687 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | | | qdoc: Fix single-character string literals.Friedemann Kleint2015-10-1310-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I7011ae6ee55107b4788cc434e0dc3618c4213799 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | | | WinRT: Fix native MessageBox not closingMaurice Kalinowski2015-10-131-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message box buttons need to be added inside the XAML thread. Otherwise QWinRTMessageDialogHelper::onCompleted will not be triggered. To successfully emit the clicked signal across different threads do not exit the eventloop. Change-Id: Ie884bdfe0dc64132559755083dae50c2aa43d80b Task-number: QTBUG-48209 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 06:52:26 +0000