summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add public and QPA APIs for adapting existing OpenGL contextsLaszlo Agocs2014-04-242-1/+53
| | | | | | | | | | | | | For now only xcb on GLX is supported. Other platforms will follow later. Add also some missing documentation for the platform OpenGL context factory functions. [ChangeLog] QOpenGLContext is now able to adopt existing native contexts. Task-number: QTBUG-37552 Change-Id: I5dd959f102df178f646b2df5989203b5dc6de376 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* QSignalSpy: Added template function pointer constructorKeith Gardner2014-04-231-0/+168
| | | | | | | | | Added the function pointer constructor to QSignalSpy to take advantage of the new connect syntax. Change-Id: I94218a096c677cdba73e1b2cfa8b9c09bc28145f Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Introducing QPixelFormatJorgen Lind2014-04-234-0/+294
| | | | | | | | | Its purpose in life will be to describe pixel formats [ChangeLog][QtGui] Added QPixelFormat class Change-Id: I74d8f974606520efb3935110ff3d6ddb5ea805a8 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Build fix for auto-registration of Container<void*>Jędrzej Nowacki2014-04-231-0/+8
| | | | | | | | IteratorOwner pointer specialization was failing for void* because of an invalid function overload. Change-Id: I80355ddd2b871c1fa2fa5bf5a4ed8bc7768fc3c9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add a more reliable replacement for qt_add/removeObject().Volker Krause2014-04-153-1/+95
| | | | | | | | | | | | | | | | These hooks only worked reliably with LD_PRELOAD on Linux/GCC, on other platforms they depended on what exactly the compiler optimizer is doing as well as some nasty assembler rewriting to actually access them. The new system uses a simple array of function pointers that can be set to custom hooks by tools that need this (based on ideas from Andre Poenitz). This also covers qt_startup_hook (similar problem), and the Qt version number that Andre had asked for. Change-Id: I2c3e7950fd49b1b1d04176be34c2fff3293981b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Mark each QT_MOC_LITERAL usage with a commentJędrzej Nowacki2014-04-151-0/+11
| | | | | | | The comment shows to which string a QT_MOC_LITERAL is pointing. Change-Id: Ia389d750b1b1c21e2242bad6beceea4f9298ff8e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Marc Mutz2014-04-1155-147/+1055
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1155-147/+1055
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
| | * Fix tst_QListWidget::task217070_scrollbarsAdjusted()J-P Nurmi2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QMacStyle::styleHint(SH_ScrollBar_Transient) wants either a style object or the widget argument in order to return correct values. Change-Id: I2fdef0820334fa66e076a4734eb2a30c722c841c Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * QNX: Fix QCompleter autotestFabian Bumberger2014-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | The tests expect a home folder which usually is not present on QNX Change-Id: I44f548a95f14414c0db6f752fd115696069a7b90 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Support for DH and ECDH key exchange for QSslSocket serversRichard J. Moore2014-04-091-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite supporting DH and ECDH key exchange as a client, Qt did not provide any default parameters which prevented them being used as a server. A future change should allow the user to control the parameters used, but these defaults should be okay for most users. [ChangeLog][Important Behavior Changes] Support for DH and ECDH key exchange cipher suites when acting as an SSL server has been made possible. This change means the you can now implement servers that offer forward-secrecy using Qt. Task-number: QTBUG-20666 Change-Id: I469163900e4313da9d2d0c3e1e5e47ef46320b17 Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| | * Change QVERIFY in tst_qnetworkreply to warning.Friedemann Kleint2014-04-091-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FAIL! : tst_QNetworkReply::ioPostToHttpUploadProgress() 'args.at(0).toLongLong() != sourceFile.size()' returned FALSE. () Task-number: QTBUG-37449 Task-number: QTBUG-24226 Change-Id: Idcc0ceac0332705b1e3a073d40fa8098bea2c9f3 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| | * QNX: Fix QHeaderView autotestFabian Bumberger2014-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some margines and sizeHints are DPI dependent on QNX and BlackBerry. This patch skips two test that expect the section size to be of a certain pixel size. Change-Id: I7869f77fc2b623e091f53e420d1a4fdb3ec30724 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Stabilize tst_QListWidgetJ-P Nurmi2014-04-091-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | Replace weird QEventLoop hacks by sending all posted deferred delete events. Change-Id: I6da743f2b3fb6ef5dfc960dd3d752973cd511037 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Android: Add some ci usage features to Android testrunnerSimo Fält2014-04-091-9/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new options: - silent to suppress the noice from ext tools, making it easier to parse failed test cases. - ci, to check test insignificance. Requires QMake::Project cpan module if used. Also added printing out results after each test as well as full summary after test run is complete. Task-number: QTQAINFRA-641 Change-Id: Ie5f02710a939f7526e0dd39979a0cd97ed19f55b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Accessibility Mac: Cache Accessible Elements and Notify about changesFrederik Gladhorn2014-04-094-11/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The big change is that we now keep the id objects representing accessibles around so that they are persistent for ATs. This improves performance of Mac accessibility significantly. This is required for notifications which are now sent so that many things work much better, for example the VoiceOver focus follows the keyboard focus. The parent element in QCocoaAccessibleElement was removed, we can dynamically access it more reliably. Change-Id: I686d212f40d28b392dcc22f16f3c3430f08bdc98 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Add diagnostic output to tst_QtConcurrentIterateKernel.Friedemann Kleint2014-04-091-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add messages to comparisons and expect failure of blockSize() on Windows. Task-number: QTBUG-37822 Change-Id: Ie71d35a3d1ba0e52c93d5ba3fd7e92465b170d49 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * QPageLayout: provide op!=Marc Mutz2014-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | For consistency. Change-Id: I20fb70999785e2c1947f033d63367a2f6746990a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
| | * QPageSize: provide op!=Marc Mutz2014-04-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | For consistency. Change-Id: I4375a6f8c2514479a7479c735d397bf8a9876db1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
| | * QNX: Fix QGraphicsView autotestsBernd Weimer2014-04-081-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | On BlackBerry first window is always shown full screen. However, many tests rely on a specific window size. A dummy full screen window is created so subsequent windows have correct size. Change-Id: Id8bd0212b6eca677953e78505459e3cd69bc6328 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | * tst_QTreeView: fix use of uninited variableMarc Mutz2014-04-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind complained: ==13941== Conditional jump or move depends on uninitialised value(s) ==13941== at 0x4206FC: tst_QTreeView::styleOptionViewItem()::MyDelegate::paint(QPainter*, QStyleOptionViewItem const&, QModelIndex const&) const (tst_qtreeview.cpp:3062) [...] Change-Id: I76da01c191415ba0a00b4b85312f2fe08e4ee2d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * network: finish all pending replies upon errorPeter Hartmann2014-04-071-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and not only one. This was a problem e.g. when there were several requests to the same host and the host was not reachable; only one reply would get an error signal in case we suppressed other errors in "happy eyeballs" host lookup style. Task-number: QTBUG-36890 Change-Id: I1b5757498bd644b0d773cf6c43e4950620949c5c Reviewed-by: Richard J. Moore <rich@kde.org>
| | * OSX: add several menuitem roles to support menu shortcuts in dialogsShawn Rutledge2014-04-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now menu items and key shortcuts for Cut, Copy, Paste and Select All work in the standard ways in dialogs such as the file dialog, provided that the corresponding QActions have been created and added to the menu. This depends on new roles to identify each menu item which is so broadly applicable that it should work even when a native widget has focus; but the role will be auto-detected, just as we were already doing for application menu items such as Quit, About and Preferences. When the QFileDialog is opened, it will call redirectKnownMenuItemsToFirstResponder() which will make only those "special" menu items have the standard actions and nil targets. When the dialog is dismissed, those NSMenuItems must be reverted by calling resetKnownMenuItemsToQt(), because to invoke a QAction, the NSMenuItem's action should be itemFired and the target should be the QCocoaMenuDelegate. Task-number: QTBUG-17291 Change-Id: I501375ca6fa13fac75d4b4fdcede993ec2329cc7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Accessibility text updates for QTextEditFrederik Gladhorn2014-04-051-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | For Mac this makes QTextEdit work nicely with VoiceOver. Task-number: QTBUG-37204 Change-Id: I1326d24ca6a932ad667ee395f62881b6ec64e892 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| | * QPrintDialog - Add Direct print to manual testJohn Layt2014-04-053-0/+16
| | | | | | | | | | | | | | | | | | | | | Enable printing without dialog. Change-Id: I1058361febc7ddd8a5e0471e4365969e2f8becfe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix capacity reservation for shared QByteArrayThiago Macieira2014-04-054-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can squeeze, but not by discarding elements. Make sure the size of the object stays intact after changing the reserved capacity. I've also added unit tests for other containers, just to be sure. Task-number: QTBUG-37750 Change-Id: I5135b095943b7589423c51cebcb52af792468e61 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * purge vestiges of opengl es 1 supportOswald Buddenhagen2014-04-043-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Don't read before the beginning of the stringThiago Macieira2014-04-041-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code did discard the the data, so it wasn't affecting the comparison result (tests added anyway), but it could cause crashes if the pointer to the beginning of the data in the first 8 bytes of a page. Change-Id: I618e68de329b65de34ef8c934934c3e631cc6c9f Reported-By: Erik Verbruggen Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * Remove QtWidgets dependency from tst_QComplexTextKonstantin Ritt2014-04-042-2/+1
| | | | | | | | | | | | | | | | | | | | | It doesn't depends on windget for quite a long time already. Change-Id: I251e2e0d52028d17a61c892308d099f344728e79 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Remove spurious #ifdef from tst_QComplexTextKonstantin Ritt2014-04-041-8/+0
| | | | | | | | | | | | | | | | | | | | | That #ifdef is placed before any include, so it has no effect. Change-Id: I4bbf967bda720d287b363847669c5c7a22807bc4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * QTextLayout: Fix cursor movement from invalid positionKonstantin Ritt2014-04-041-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Actually guarantee cursor doesn't move in this case for both logical and visual modes (just what the documentation says we already do ;) Change-Id: Iabdca7aa1d205672386a0095e3487e585611cdb5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * QTextLayout: Fix visual cursor movement in some casesKonstantin Ritt2014-04-042-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To guarantee proper positioning at the end of the last line in a bidirectional text we have to insert the eol position into the insertion points vector, accordingly to the visual ordering. Detection of the last *logical* item in a *visual* line is unrelaed to the text direction, it is simply `iterator.item == iterator.lastItem`. [ChangeLog][QtGui][QTextLayout] Fixed visual cursor movement in bidirectional text. Task-number: QTBUG-18060 (partially related) Change-Id: I53b6ab889ef580ab0560b620b808b1e09efc0fbd Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Ahmed Saidi <justroftest@gmail.com>
| | * BlackBerry: Fix QListView autotestFabian Bumberger2014-04-041-9/+22
| | | | | | | | | | | | | | | Change-Id: Id4967911d82cff86214665cc9ca3dbbefa69da11 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Fix QTreeWidget autotestFabian Bumberger2014-04-041-2/+6
| | | | | | | | | | | | | | | Change-Id: I94b4d9d2f0ef013691faedc4cd12050aa49e98f2 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Improve handling of temporary directories in SQL tests.Friedemann Kleint2014-04-049-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize directory delayed in shared code and add checks to verify that it is valid. Close attached / cloned databases to prevent locks on files and leaking temporary directories caused by SQLite: QTemporaryDir: Unable to remove "...\Temp\tst_qsqldatabase-P1XkOA" most likely due to the presence of read-only files. QTemporaryDir: Unable to remove "...\Temp\tst_qsqltablemodel-P1XkOA" most likely due to the presence of read-only files. QWARN : tst_QSql::concurrentAccess() QTemporaryDir: Unable to remove "...\Temp\tst_qsql-l0VAKJ" most likely due to the presence of read-only files. Change-Id: If85bbaed04bb1a32e427d642be332996d967f796 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Fix lance opengl painting testaavit2014-04-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change b94493e revealed that in the lance script rendering, at the surface_end command, cleaning up the fbo stuff and enabling the ordinary painting again was done in the wrong order. Change-Id: I358dafeffe95b25303fc2a8dc1d61384b2ca64fb Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| | * Fix QTextEdit autotestFabian Bumberger2014-04-041-1/+2
| | | | | | | | | | | | | | | Change-Id: I2178f1bb09f334ac518ede8f08c5b9268ea0c505 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * QNX: Fix QAbstractItemView autotestFabian Bumberger2014-04-041-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | One problem was that tests expect the top-level window to have a certain size, which is not possible on BlackBerry. Another problem was that certain elements have a dpi dependent size which the task250754_fontChange test did not consider. Change-Id: I465ebe234a74d6150cdcbb7fc7e458a62155e0d0 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * BlackBerry: Fix tst_qdialog::show{Maximized,Minimized} testsSergio Ahumada2014-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using show() might result in showFullScreen() on some platforms, so let's use setVisible(true) which has the same effect and seems to be a more crossplatform solution. Change-Id: I712584ace2adbe73b99e620a1ae5e88ff328fffb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | * Add a benchmark test for QCryptographicHashThiago Macieira2014-04-043-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some quick benchmarks against GNU coreutils 8.21 and OpenSSL 1.0.1e (time in µs; time for coreutils and OpenSSL include the loading of the executable): Qt Coreutils OpenSSL n SHA-1 SHA-224 SHA-512 SHA-1 SHA-224 SHA-512 SHA-1 SHA-224 SHA-512 0 0 0 0 717 716 700 2532 2553 2522 64k 120 484 381 927 1074 966 2618 2782 2694 Diff 120 484 381 210 358 266 86 229 172 The numbers for Qt are pretty stable and vary very little; the numbers for the other two vary quite a bit, since they involve launching and executing separate processes. We can take the lesson that we're in the same ballpark for SHA-1 and we should investigate whether our SHA2 implementation is sufficiently optimized. Change-Id: Ib081d002ed57c4f43741eca45ff5cd13b97b6276 Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Fix QTabBar autotest for high DPI displaysFabian Bumberger2014-04-031-4/+9
| | | | | | | | | | | | | | | Change-Id: Ic50d7fb9eb3568f16dd1422c380a4ae7bb288a51 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Fix the QGridLayout autotestFabian Bumberger2014-04-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | One issue was that the text of a QPushButton would stretch the widget if the platform font is to big. The other issue was that the autotest did not expect that show might translate to a showFullScreen on some platforms. Change-Id: I3a9903979d766d04c402fda309d0492cfa506ed6 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Fix QPushButton autotestFabian Bumberger2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the sizeHint test the show command was replaced by showNormal. This fixes the test an all platforms where show translates to showFullScreen. Change-Id: I307790a6987c61a57679094b26818383815036a0 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Logging: Be also more strict with value of logging ruleKai Koehne2014-04-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only accept lower-case "true" and "false", as documented. The old check didn't match either the documentation, nor the QSettings/ QVariant behavior (where, for a boolean value, any lower-cased content that not empty, "0" or "false" is considered true). Change-Id: I317d29c16a27f862001b9dff02e8298df8acf5a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Re-add missing test to kernel.proJędrzej Nowacki2014-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 9a08483d763dacfca6029f7a8970846e83df0e2a introduced a regression, tst_qmetatype test was not meant to be removed. Change-Id: I5456ffbbd9d9f8e461f828c6183e46dabf67952b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * QNX: Fix OpenGL autotestFabian Bumberger2014-04-011-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On QNX grabbing the frame buffer returns the content of the back buffer. In order to execute the OpenGL tests properly a swapBuffers is executed before in order to be able to retrieve the content of the front buffer. The patch also documents this platform behavior. Change-Id: I7a501818ec6eea061f2f54f95854f68cb72e0534 Reviewed-by: James McDonnell <jmcdonnell@qnx.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | QStringList: add op= overloads for QList<QString>Marc Mutz2014-04-111-0/+16
|/ / | | | | | | | | | | | | | | | | | | | | QStringList = QList<QString> already compiled, but was interpreted as QStringList = QStringList(QList<QString>), which involves the QList copy ctor. Adding the overload saves that copy. Cannot use a using declaration here, since the return type is different. Change-Id: I9f4feb2f97480d2d6a3b6fa7c71b5d511b623601 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Stabilize QListWidget testMarc Mutz2014-04-071-7/+1
| | | | | | | | | | | | | | Shot in the dark, as usual. Change-Id: I272392e6d865f6b32047c3a0ebad70c0f007ba58 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | QWeakPointer: add member-swapMarc Mutz2014-04-031-0/+24
| | | | | | | | | | | | | | | | [ChangeLog][QtCore][QWeakPointer] Added member-swap function. Change-Id: Ide3672dc74a9d8153e5f930290d938e8c23993b5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QWeakPointer: add lock() for std::weak_ptr compatibilityMarc Mutz2014-04-031-0/+18
| | | | | | | | | | | | | | [ChangeLog][QtCore][QWeakPointer] Added lock() method for std::weak_ptr compatibility. Change-Id: I0851d91c51f5a4f04a855a1d8082234ce38396b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>