summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Stop using setSharable in the Java-style mutable iteratorsThiago Macieira2014-05-181-91/+1
| | | | | | | | | | | | | | | | | | | First and foremost, the STL-style iterators don't do this. Those don't provide a guarantee that the container won't get shared again while the iterator is active. Second, there's no protection against a second mutable iterator being created and resetting the sharable flag back to true. [ChangeLog][Important behavior changes] The mutable Java-style iterators like QListMutableIterator and QHashMutableIterator no longer set the parent container to unsharable mode. If you create a copy of the container being iterated on after the iterator, any changes done with the iterator might affect the copy too. Discussed-on: http://lists.qt-project.org/pipermail/development/2014-February/015724.html Change-Id: Iccfe411d5558c85ae459cff944215614c392388e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* QPainter on QBitmap: make setBrush(NoBrush) work as expected.David Faure2014-05-171-0/+22
| | | | | | | | | | | | | | | It had no effect because of an explicit check for NoBrush. However the default in QBitmap is (unfortunately) QBrush(color0), rather than NoBrush, so the brush must be updated when calling setBrush(NoBrush). I suppose the real issue is that lastBrush is default-constructed in QRasterPaintEngine, rather than starting with the brush from QPainter, which is QBrush(color0) for the case of the bitmap. But no reason to special case NoBrush here anyway. Task-Number: QTBUG-38781 Change-Id: I9996ac12bf628920cfaf0de9c886f637a336028b Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Optimize QVector::midJędrzej Nowacki2014-05-161-0/+2
| | | | | Change-Id: Iff7d9ec85a095c6712e6045e7708bb88eac629e1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add viewport transform to QMatrix4x4Sean Harmer2014-05-161-0/+35
| | | | | | | | | | | | | This allows to easily create a matrix that performs the transformation used by OpenGL fixed function to go from normalized device coordinates to window coordinates. This comes in useful if you need to perform the NDC->window coordinate conversion inside a shader. Change-Id: I183b3545bfb3eb1e8b13fc3172911b46926fcbb7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Windows: Use new clipboard API for listening to changes.Friedemann Kleint2014-05-151-5/+41
| | | | | | | | | | | | | | | | | | The currently used clipboard chain API has various problems with non- responsive applications and requires checks for hung/debugged applications when sending on notifications. The new clipboard format listener API available from Windows Vista onwards requires less code and does not have these problems, however the change notifications now arrive asynchronously. Change the tst_qclipboard to be able to deal with asynchronous change notifications. Task-number: QTBUG-38670 Task-number: QTBUG-33492 Change-Id: I3c49e346a34310431c20f3051d12eaabf330a3ad Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Friedemann Kleint2014-05-146-30/+45
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-136-30/+45
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85
| | * Don't assume QLocale::codecForLocale always returns non-nullThiago Macieira2014-05-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may return null during program exit, due to QCoreGlobalData global static already having been destroyed. If that's the case, QTextStream needs to fall back to Latin 1, like QString::toLocal8Bit and fromLocal8Bit already do. Task-number: QTBUG-38316 Change-Id: I5949c8dec15b60f4a13b5d9307ed6abfc799fe20 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * tst_QWidget::windowMoveResize(): Fix QEXPECT_FAIL / QTRY_COMPARE .Friedemann Kleint2014-05-091-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | QEXPECT_FAIL followed by QTRY_COMPARE considerably slows down tests due to the check timing out. Task-number: QTBUG-38890 Change-Id: I7f90f2627fc6ce149d159a6d13355ca1a8181d54 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Fix dangling pointer dereferencingThiago Macieira2014-05-091-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | That long call chain is screaming "here, I'm dereferencing dangling pointers! Valgrind me!" but 2006 Thiago didn't see them... Change-Id: I44de5aea113d05edec2227e9db6be8cec9303be9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Autotest: make sure the helper programs in QtDBus aren't bundlesThiago Macieira2014-05-092-0/+4
| | | | | | | | | | | | | | | | | | | | | The main test won't find them if they are. Change-Id: Iae3ffe4c0289a0c88d46c1bd2e414c20def89ab4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * QDateTime: Add more tests for parsing/writing timezone offsetsDaniel Seither2014-05-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for toString/fromString previously didn't run tests for timezones with hh:mm where mm != 00. Change-Id: I74da99c5b6890f46ce06446084a8129b4cbc7a02 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: John Layt <jlayt@kde.org>
* | | Move the PKCS#12 support from QSslSocket to QSslCertificate.Richard J. Moore2014-05-149-49/+124
|/ / | | | | | | | | | | | | | | Discussed with Peter and agreed that it's a slightly better fit there. Change-Id: If8db777336e2273670a23d75d8542b30c07e0d7b Reviewed-by: Daniel Molkentin <daniel@molkentin.de> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-05-1310-68/+333
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-1310-68/+333
| |\| | | | | | | | | | | | | | | | | | | Manually changed enum to LibGL in src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
| | * Speed up tst_QXmlSimpleReader.Friedemann Kleint2014-05-081-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the chunk size of the server and remove hard-coded interval when waiting for the server to listen. Unmodified, the test takes 170s on Windows. Change-Id: I65bdc93ff78e1b4fb429fcafd0fdc5e80bb281f9 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Fix tst_QStyleSheetStyle::toolTip().Friedemann Kleint2014-05-081-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct palette and enforce Fusion style to prevent the Vista style from clobbering the tooltip palette in polish(). Task-number: QTBUG-38183 Change-Id: Id19d548f818d801c4914a343e08207195c343888 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| | * Revive tst_qstylesheetstyle on Desktop platforms.Friedemann Kleint2014-05-082-32/+91
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-21468 Change-Id: I37f741d9709b17ad31b01078e10538f0f6bff01a Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Fix visual index lookup in QTreeViewPrivate::adjustViewOptionsForIndex().Friedemann Kleint2014-05-061-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Determine the visual index by looking up the column of the QModelIndex in the logicalIndices array instead of looping. Task-number: QTBUG-37813 Change-Id: I5c3c73c67537877b03cdc2c36a52041d99f7f49d Reviewed-by: David Faure <david.faure@kdab.com>
| | * QFileDialog: Return empty QUrl from the static get..FileUrl() functions.Friedemann Kleint2014-05-061-0/+45
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-38672 Change-Id: Idf554cd93d1a79db7c82f3165bd128fb31ead3e5 Reviewed-by: David Faure <david.faure@kdab.com>
| | * Add autotest for the QSslCertificate QIODevice constructor.Richard J. Moore2014-05-061-0/+42
| | | | | | | | | | | | | | | | | | Change-Id: I92fa083665509932b75ff1037904a6f78a950fd6 Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| | * Add an autotest the QSslCertificate::version() method works.Richard J. Moore2014-05-061-0/+29
| | | | | | | | | | | | | | | | | | Change-Id: Ife5b7206fd3d7af57cfca3c0f28f56bb53ede7a7 Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| | * Accessibility: Do not report popup for QLineEditFrederik Gladhorn2014-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing else seems to report this state and on windows for example it results in NVDA reading subMenu which makes little sense. Task-number: QTBUG-38500 Change-Id: I64820d9f2ea9174034f01da42cb2266a19c19465 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| | * Revert "Ignore tst_QStyleSheetStyle::hoverColors() failures on Mac OS X"Liang Qi2014-05-061-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test doesn't fail on Mac any more. This reverts commit 36493a7a41b7ce38af429a943a73d791100c6c13. Task-number: QTBUG-23685 Change-Id: Ib7c56494b07de9839b3287758fe228f799bc343c Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Use sched_yield instead of pthread_yieldFrederik Gladhorn2014-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | sched_yield is standardized and on linux pthread_yield is implemented as sched_yield. Building Qt for Android on OS X doesn't compile with the pthread version. Change-Id: I1913afa83769805291e987f55b8f452299a43dce Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-032-0/+62
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Manually fixed up: isES -> isOpenGLES src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
| | | * Fix assert on justification of QTextLine with only spacesEskil Abrahamsen Blomfeldt2014-04-301-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the justification code, we unconditionally subtracted one from the line_length, but then compared the result to 0 afterwards, so we did not support when the line_length is 0 initially, which can happen if it only consists of spaces (in which case trailingSpaces will be non-zero and line_length will be zero.) The fix is to bail out for both strings of length 1 and length 0. [ChangeLog][Text] Fixed an assert when justifying a QTextLine which only contains spaces. Task-number: QTBUG-38520 Change-Id: Ib04993f47eb2f9f7fc49c4a5400f18f9682a72f2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * Fix incorrect repaints with plain text editSimon Hausmann2014-04-301-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plain text edit's smart repaint logic in QPlainTextDocumentLayout::documentChanged assumes that during a change inside just one block, the block is in the state before the edit and a call to layoutBlock() is going to bring it up-to-date. Then only a comparison of the bounding rect - before and after - is going to allow for smart repaints. The assumption of the layout being in the same state as before the edit got broken by commit cc57a2e90f18a39ce3c74b6ad0db9a64aa135ddf, which introduced code to use a QTextCursor within a slot connected to QTextDocument's contentsChange signal. The usage of the QTextCursor there ends up updating the layout of the block ahead of time, breaking the assumption and therefore the optimization, in the sense that during changes in the preedit that cause a change of height / line count, the old bounding rect in QPlainTextDocumentLayout::documentChanged and the new bounding rect will be the same. This causes a repaint of only the edited block, missing repaints of the following blocks, even though the line count effectively changed. So what's causing QTextCursor to mess with the layout is the attempt of updating the vertical movement x property. This patch inhibits the update, marking it as dirty for initialization later. This means that slots connected to this low-level signal cannot rely on the cursor's visual x position, but that doesn't seem useful anyway and isn't required for commit cc57a2e90f18a39ce3c74b6ad0db9a64aa135ddf. Task-number: QTBUG-38536 Change-Id: I5fae12d646a4b2d2cc22b9f2d021e5dc8cfdda94 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | | | Remove unsused local variables from tst_collectionsJędrzej Nowacki2014-05-131-4/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4ca1862d29432ca83b90024664b548ea0eef26c0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Fix gcc warning in tst_collections.Jędrzej Nowacki2014-05-131-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: typedef 'Foo' locally defined but not used [-Wunused-local-typedefs] Change-Id: Ifb1213414feb3aa5a5e46dac163e51ccd4925498 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Move tst_collections test to corelib/tools.Jędrzej Nowacki2014-05-135-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to have the test separated from other tools tests. Change-Id: Ie5b19961c383f5e4bc1ad4452cba7b92153fc303 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Add support for loading PKCS#12 bundles.Richard J. Moore2014-05-114-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for loading certificates and keys from PKCS#12 bundles (also known as pfx files). Task-number: QTBUG-1565 [ChangeLog][QtNetwork][QSslSocket] Support for loading PKCS#12 bundles was added. These are often used to transport keys and certificates conveniently, particularly when making use of client certificates. Change-Id: Idaeb2cb4dac4b19881a5c99c7c0a7eea00c2b207 Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
* | | | Support adopting an existing EGLContext in eglfs and xcbLaszlo Agocs2014-05-096-1/+316
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add also a manual test application. For GLX there is an autotest since that is likely to be run on one of the CIs. For EGL and especially eglfs this is likely not the case so a manual test is better. Task-number: QTBUG-37552 Change-Id: Ib09db5d909befb68d16f69abd401a56abe55f28a Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-05-0838-203/+622
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-0638-203/+622
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
| | * | QNX: Fix QLineEdit autotestFabian Bumberger2014-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84c386a146dd484db844fa93165b28e19e4cefd7 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
| | * | Ignore the fullscreen state of a QMdiSubWindowFabian Bumberger2014-05-021-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some platforms all windows are by default forced into fullscreen mode when show() is executed. In QMdiSubWindow we cannot handle the fullscreen state and should ignore it. Otherwise the window will be forced in "normal" state and ignore any previously executed geometry changes. Change-Id: I09ce6507a1eac6a0adb3405ca3f423642d30f801 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-0113-56/+176
| | |\| | | | | | | | | | | | | | | | | | | | | This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
| | | * Rename new QOpenGLContext APIsLaszlo Agocs2014-04-254-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isES() becomes isOpenGLES(). The library type enums are changed DesktopGL -> LibGL and GLES2 -> LibGLES. This removes the now unnecessary version number, the confusing "desktop" term and provides better readability. The old function/values are kept until the related qtdeclarative changes are integrated. Task-number: QTBUG-38564 Change-Id: Ibb0a1209985f1ce4bb9451f9b7b093c2b68a6505 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | | * QSqlError: Mark deprecated functiond with QT_DEPRECATEDOlivier Goffart2014-04-251-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And move the default argument from the deprecated constructor to the new one Also make sure that the error number is consistent across the two constructor Change-Id: I3721266b39ab493f0add35b2d1f892b2f6094992 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * Deprecate setSharable in Qt containersThiago Macieira2014-04-247-47/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ability to set a container to be unsharable has very little use and it costs us an extra conditional for every refcount up and possibly down. This change is a no-op for current Qt 5. It shuffles a few things around just so Qt can compile if you define QT_NO_UNSHARABLE_CONTAINERS. That is done to ease the fixing of the code in Qt 6 and to make my life easier: I'll keep that defined in my local Qt build so I can catch any misuses of this deprecated API. The newly deprecated methods are not marked QT_DEPRECATED because the bootstrapped tools wouldn't build -- they're built with QT_NO_DEPRECATED defined, which causes build errors. [ChangeLog][QtCore] The setSharable() and isSharable() functions in Qt containers has been deprecated and will be removed in Qt 6. New applications should not use this feature, while old applications that may be using this (undocumented) feature should port away from it. Discussed-on: http://lists.qt-project.org/pipermail/development/2014-February/015724.html Change-Id: I789771743dcaed6a43eccd99382f8b3ffa61e479 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * Restore handling of BOMs in QString::fromUtf8Thiago Macieira2014-04-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dd47e34b9b96ac27a99cdcf10b8aec506882fc2 removed the handling of the BOMs but did not document it. This brings the behavior back and adds a unit test so we don't break it again. Discussed-on: http://lists.qt-project.org/pipermail/development/2014-April/016532.html Change-Id: Ifb7a9a6e5a494622f46b8ab435e1d168b862d952 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | Stabilize tst_QAbstractItemView::task250754_fontChange().Friedemann Kleint2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase window size when verifying that the scrollbar disappears when using a small font on Windows 8.1 Change-Id: I7d4520bc5882d8ccd59db3f5bff7e9d6d68a4827 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| | * | Fix PSQL column's metadataparihaaraka2014-04-291-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed libpq's PQfmod() interpretation inside QPSQLResult::record() Task-number: QTBUG-12477 Change-Id: I0e4c94ca1b06fd6a8e5b5702235cdd6d9736f8bf Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * | Observe case insensitive file systems in QFileDialog::selectFile().Friedemann Kleint2014-04-291-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stripping the root path from a file name that cannot be found in the model, use case sensitive comparison depending on file system. Task-number: QTBUG-38162 Change-Id: I28e28973fca2da35a5768fdd00cc258b9669a15a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * | Add press action to QAccessibleComboboxFrederik Gladhorn2014-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VoiceOver expects press to open the combobox. Task-number: QTBUG-37922 Change-Id: Iee7b7974db097e4e2444202c703bd587e1576fe0 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| | * | Fix crash when accessing QFileDialog::selectedFiles() before widgets exist.Friedemann Kleint2014-04-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discovered while investigating: Task-number: QTBUG-38414 Change-Id: I764195254ba4b54c86079c6e8ef750d6249960d9 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * | [QSqlQuery] misbehavior of seek in special query positionsIsrael Lins Albuquerque2014-04-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QSqlQuery::at() == QSql::BeforeFirstRow and seek(1, true) (seek to next record) is called the expected result is go to first row. When QSqlQuery::at() == QSql::AfterLastRow and seek(-1, true) (seek to previous record) is called the expected result is go to last row. But in all cases the first and last are skipped. Change-Id: I584138b3d397ce1c790bf89688ee92289a99611c Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * | QTcpSocket auto test: Temporarily disable Socks5 testsPeter Hartmann2014-04-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because they are too unstable. We can check whether they are more stable once the new network tests server is in place. Task-number: QTBUG-38385 Change-Id: I5ced7cc1f89290812aa88f174a41965fd2ef7252 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * | Add missing #ifndef QT_NO_SSLFrederik Gladhorn2014-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2912dcca77270582f6e989b8b3fb72b82f6f70d6 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Richard J. Moore <rich@kde.org>