summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correct error in Makefile generation for Windows MinGW.v4.8.5Michael Brüning2013-06-061-1/+1
| | | | | | | | | | | | Remove the build_pass check that was added for vcproj generation as it is no longer deemed necessary. See http://trac.webkit.org/changeset/62264 and http://trac.webkit.org/changeset/59266 for context. Task-number: QTBUG-27413 Change-Id: Ie82032cf4b183b31c66defc2d49cc8095989ec8f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Don't overwrite QMAKE_QT_CONFIG with empty valueJonathan Liu2013-06-061-1/+5
| | | | | | | | | | | | If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten with an empty value from .qmake.cache. Avoid this by first checking if the value from .qmake.cache is not empty before assigning it to QMAKE_QT_CONFIG. This was already addressed differently in Qt 5. Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove Nokia references.Leonard Lee2013-06-043-5/+1
| | | | | | | | | | These Nokia references removed as they are not appropriate. Task-number: QTBUG-31400 Change-Id: Ib80d2c2d28353e74c46e9ead9cde9807dad7022d (cherry-picked from qtdoc/019f96bc47cf56170c125ae90f5fc00059f6665d) (cherry-picked from qtwebkit/d7b8c69ccdd5547b5660be5876dbdedc3ac29548) Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Re-enable compilation of idc for MinGWKai Koehne2013-06-041-1/+1
| | | | | | | | | | | | | | | | | | | Re-enable compilation of idc for MinGW to fulfill the activeqt dependency on idc. idc and activeqt compile fine with MinGW, but most examples won't work because of the missing midl compiler. This was the reason activeqt and idc was disabled originally after Qt 4.8.4. Anyhow, 330ca76b then re-enabled compilation for activeqt, but not idc, which broke the build. This patch re-enables compilation of idc, but still by default does not compile activeqt examples. Qt 5 ships with activeqt / idc for MinGW too, btw, so excluding it in Qt 4.8.5 is inconsistent. Task-number: QTBUG-31517 Change-Id: I7d4e7ed56c1954996b7291f56143ff83fcdcb0a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make sure idc links only against QtCoreKai Koehne2013-06-041-0/+2
| | | | | | | | Do not link against QtGui (which might not have been compiled yet). Task-number: QTBUG-22260 Change-Id: I42d926cc30a0bc278fc796f32652281c03f140d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Disable precision timers when running MSVC2012 code on pre-Windows 8.Friedemann Kleint2013-06-041-1/+5
| | | | | | | | | | | Precision timers can cause the event loop to lock up when running MSVC2012 code on pre-Windows 8. Task-number: QTBUG-27266 Change-Id: Idd73731e82843d0d140859bab825bc1a54eccf1a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from qtbase/aa1b4c0943187d82e0c313b93559e99226a9c75a)
* Update LICENSE.PREVIEW.COMMERCIAL licenseSergio Ahumada2013-06-031-2/+2
| | | | | | Change-Id: I8af7630ec54e1a9d4b063e8278df5e75d2abf97e Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Doc: Fixed typo in QDialog.Jerome Pasion2013-06-031-1/+1
| | | | | | | Task-number: QTBUG-31493 Change-Id: Ie112f601d629c794842d746e7b9c96849c74bdf6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix Qt WebKit build for non-default Xcode setup / Xcode 4.3+Danny Boelens2013-05-311-4/+4
| | | | | | | | | | There's no need to test the full path, the actual name of the SDK will do. This fixes the build in cases where Xcode is not installed in /Developer or when building with Xcode 4.3 or higher (where Xcode is a bundle), because in those cases the SDK's full path does not start with /Developer. Change-Id: I598ba2a5ebaae813f576dc72102d05fe8804a86f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Tools: unnecessary to make qmlplugindump a bundleLiang Qi2013-05-281-2/+7
| | | | | | | | Embed Info.plist in qmlplugindump executable in a special way. Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8 (adpated from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* postgresql driver: escape backslashes only when server requires itMark Brand2013-05-281-5/+33
| | | | | | | | | | | | Task-number: QTBUG-30076 Change-Id: I408cda941884f01484d0edfa82c91fc19cb8718c Reviewed-by: Israel Lins Albuquerque <israelins85@yahoo.com.br> Reviewed-by: Sergey Blagodarin Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Andras Mantia <andras@kdab.com> (cherry picked from qtbase/e3c5351d06ce8a12f035cd0627356bc64d8c334a) Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Doc: corrected LGPL Exception headerNico Vertriest2013-05-251-1/+1
| | | | | | | | | | | Task-number: QTBUG-31271 Change-Id: Ifdb36c4bc01f88f743f128e46272b5c9c20fde4e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* rebuild configure.exeOswald Buddenhagen2013-05-251-0/+0
| | | | | | | | | | | | | | | | 583f6e1: Disabling largefile support for WinCE 2bba0ea: Avoid macro re-definition after 65bd0bd1f04 45a277c: Fix url about evaluation license e80d7bb: unmess CONFIG/QT_CONFIG static/shared e5735c9b: Update copyright year in Digia's license headers f7e9417: fix -inotify option e5e5238: add inotify command line switch 69b918f: Fix syntax error on configure.exe source code. deca010: Use slogger2 for logging on Blackberry instead of writing to stderr Change-Id: I5ed9540aa3841be05926669cdc40afd608f69a37 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix creating new QWS surface only when it does not exist alreadyPasi Petäjäjärvi2013-05-231-1/+6
| | | | | | | | | | | | Calling createSurface(const QString &key, const QByteArray &data) function is needed when starting/creating new server/client application, and changes to region sizes (and memory allocation) after that is handled by QWS surfaces themself inside setGeometry(const QRect &rect) function. Task-number: QTBUG-31254 Change-Id: I97c78ebe83b2aa9ab9e4ffc8a9987ab2528f8cf1 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix QLocale::standaloneMonthName when d->m_data == systemData()El Mehdi Fekari2013-05-216-3/+17
| | | | | | | | | | | | | | | | | At the moment if d->m_data == systemData() it calls systemLocale()->query but forgets about the standalone part so you get the wrong data This patch introduces the new enums so that backends can implement properly the standaloneMonthName feature properly. At the moment the Windows and Mac ones still return the monthName, the Unix and Blackberry ones return the data we store in months_data. cherry picked from qtbase/b1de018e9a1efcd0f9e298ae4c865197feb47895 Change-Id: I1054420dc696ed2be0d52bdc6567ebaf202faf12 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QNX: Enabled ALSA supportBernd Weimer2013-05-211-1/+1
| | | | | | | | | If ALSA version >=1.0.10 is available on QNX it will be used by QAudio classes. In Qt5 this is enabled already. Change-Id: Ia4e3952ee147eaf78be7cec3c8a9fcfc97da332c Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Convert the new filename to native separators before checking itAndy Shaw2013-05-181-1/+1
| | | | | | | | | | | If a native separator was put in the new name when renaming a file name via the file dialog then it would correctly fail. But if a non-native one was used on Windows then it would cause the file to be moved instead if the directory existed. Change-Id: If01760b8c54a69b600c9a44c7509017be70d33e3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qtbase/9ec493fa41d06a618d3983c02d9a1141d9d306df)
* Respect specified minimum height for menuBar also if it has HFW.Jan Arve Saether2013-05-151-6/+4
| | | | | | | | | | | | | | | | | | | | If the menu bar is subject to height for width (HFW) we should of course respect that, but in addition we should ensure that the HFW is within the minimum and maximum height. This also is consistent with how QGridLayout calculates the effective minimum row height. This fixes a regression because change 4780f94e391b5e881497c5228661dead turned QTabWidget into a proper height-for-width citizen, and when setting a QTabWidget as a menuwidget, the buggy codepath for HFW was suddenly hit in menuBarHeightForWidth(). Task-number: QTBUG-31057 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> (cherry picked from qtbase/27e690e163408dec1e9c56ffc07131354d4b2c8a) Change-Id: I915d37c69152c1804925000303e82a3fae5a9a47 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QGV: fix items not to be selected on right mouse button releaseJ-P Nurmi2013-05-152-1/+29
| | | | | | | | Task-number: QTBUG-30990 Change-Id: Iaf2dd7ed496625097daa05d5dc92ef5957574ee9 (Cherry-picked from qtbase/0b862e067756132225e33be09670631edd50d944) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* Prevent crash due to giving QWidget::update() a large region.Samuel Rødal2013-05-151-3/+8
| | | | | | | | | | | | Similar to what change a298216bb4383dbe96 does for update(QRect) we clip the update region against the widget's rect and return if it's empty. Otherwise we risk ending up with update rects that are larger than INT_MAX due to multiple update rects being merged. Task-number: QTBUG-30876 Change-Id: Idf695b1fdca50449a1e5ddf37500653de290590c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit 69ee30260a667b2b977a0d4b52abf6537521cce8)
* Prevent crash due to giving QWidget::update() a large rect.Samuel Rødal2013-05-151-4/+9
| | | | | | | | | | | | We can simply clip the update rect against the widget's rect and return if it's empty. Otherwise we risk ending up with update rects that are larger than INT_MAX due to multiple update rects being merged. Task-number: QTBUG-30876 Change-Id: I23bd0149fbe8d1a007a60b228e6bddb45dc4fc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit a298216bb4383dbe96688dfb80da0cd875766de0)
* test: Mark tst_qinputdialog as insignificant only on Mac OS XSergio Ahumada2013-05-151-1/+1
| | | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTBUG-31101 Change-Id: Iccb8169dc513df7c0c34cd15d21d11e59cb44f11 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Widgets: avoid integer divide by zero in QProgressDialogLiang Qi2013-05-152-0/+19
| | | | | | | | | | | Autotest is included. Task-number: QTBUG-31046 Change-Id: Ief7d71b58e7a5416f3659f19445e5d729849b3b6 (cherry picked from commit 69c05bbef47fb9d30d70e594bd5942add8b135fe) Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* BlackBerry: Revised error handling in event dispatcherBernd Weimer2013-05-151-40/+42
| | | | | | | | | | | | | Added an upper bound check for socket notifier file descriptors. Too high FDs have been a real source of failure. Added compiler hints to allow error-free code path run faster (errors are highly unlikely) and adjusted warning messages (some were misleading and too long). Backported from qtbase: ebd5de1 Change-Id: Ib982f853ee803447bdcaf22aed310697a36b4ccf Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Backport qmlRegisterUncreatableType with version templateAlan Alpert2013-05-151-0/+45
| | | | | | | | Otherwise it is not possible to extend or add uncreatable types safely. Change-Id: I22e81bb46a69efcec3522454d5ad465099b2555b Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Disabling largefile support for WinCE.Bjoern Breitmeyer2013-05-131-0/+1
| | | | | | | | | | | | | This was disabled before, but 2bba0eadc1570f29331285738b9d319687f84d4c enabled it per default. Change-Id: Ic5a8e50d116cf6b15719668faf055967a6f34e06 (cherry picked from commit 45750b18187ef257a986cf6ab8b2c97ef3ba6e52) Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake/vcxproj: resurrect support for /we compiler switchJoerg Bornemann2013-05-133-1/+8
| | | | | | | | | | | | | The vcxproj format supports the /we compiler switch as TreatSpecificWarningsAsErrors tag. Support for this switch got lost during refactoring of the vc(x)proj generators for Qt 4.8.0. Task-number: QTBUG-29098 Change-Id: I607e907dcb9c1bc7d261053b6d757941ec7db822 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit a3d1d41d1d88b989fe7c460ef32b4f8606aafe0c)
* qmake/vcxproj: fix parsing of /RTC* optionsJoerg Bornemann2013-05-132-14/+30
| | | | | | | | | | /RTCsu and /RTCus must be handled as full runtime check options. Task-number: QTBUG-30711 Change-Id: I783bf49f2ab1d4fd9636dca8e434bccb54844c8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 3c62f4d0c65f1a60bd8d4e6b985d79cb0aa8342b)
* test: Mark tst_qsharedpointer as insignificant only on Mac OS XSergio Ahumada2013-05-121-1/+1
| | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTBUG-31100 Change-Id: I925accd0637250ba8e7a0173c51a2171b4e960b3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Special-case the forward declaration of STL types for libc++.Raphael Kubo da Costa2013-05-111-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is somewhat of a follow-up to 5210d47aa66214e3cb16f394d0510a91f770c1b1. libc++ declares the STL types in an inline namespace within the "std" one if clang is used. If one includes a header such as <iterator> before a Qt one and builds with QT_NO_STL, the following ends up happening: // <iterator> namespace std { inline namespace __1 { struct random_access_iterator ... ; } } // qiterator.h #ifdef QT_NO_STL namespace std { struct random_access_iterator; } #endif qiterator.h's declaration shadows the original one, and the compiler complains random_access_iterator lacks an actual declaration. Solve this by checking for libc++ and forward-declaring the iterator types we need within the same inline namespace. Not backported from qtbase because QT_NO_STL does not exist in Qt 5. Change-Id: I6742d540f6538a30aa060a4447c288cfb9cd781d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* test: Remove insignificant_test from tst_qaudioinputSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I51df22c00d4e13a0b83230bc25e1b810ed183539 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qgraphicsscene as insignificant only on Embedded (QWS)Sergio Ahumada2013-05-111-1/+1
| | | | | | | | This test has been passing lately for Linux, Windows and Mac OS X. Change-Id: I994fe4c69c3520fe1eabf2d92224c8dd040ba3d9 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qdbusmarshallSergio Ahumada2013-05-111-2/+0
| | | | | | | | | This test is now passing on all CI platforms. Change-Id: I19f1b4bd4969bf9e396d696a273d214af16ebd9a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qgraphicsanchorlayoutSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: Idd094cdbc2a21f3e5840366f8f47b9a187331023 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qgraphicsanchorlayout1 as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: I6f21bf40d93adc8e359cf9fa0feea7fd4140736e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qgraphicswidget as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: Ie658d90cbc9eb2b68a963b1f1de06ca37f44047e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qinputcontext as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: Ib1d44ce284e3d0dcfa539376928cb41516a2059a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qitemdelegateSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I06b659a750dcc76858287eb8336aa5228298d6e5 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qmacstyleSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I421a7f541e24f1f1ebad8a68cc599bbdd38a767a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qpainter as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: I7b92c105bfa4fc00c92a00d4d731cabc878bb073 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qscriptextensionpluginSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: Icd24090b782738c3ab2635d41560eaf0d6b7ba1a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qsettings as insignificant only on WindowsSergio Ahumada2013-05-111-1/+1
| | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I9dfc0c5b79a019e70fba04502050b35997384928 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qstylesheetstyle as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: I7a3001381df805c9424b694197a92b467d69c1bc Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-05-113-6/+12
| | | | | | | | | | | | | | | Fixes a regression whereby on the first mouse move the contentItem was moved the total distance from the touch point to where the drag distance was exceeded. For large drag thresholds this causes a noticeable jump. Task-number: QTBUG-30032 (cherry picked from qtquick1 3a80424aeae19e838be03aa12a5243911ec3f020) Change-Id: I92c119d27dc2e22203484f9ada5978697d171957 Reviewed-by: Martin Jones <martin.jones@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Check that 3DNow! instructions are supported before including mm3dnow.h.Raphael Kubo da Costa2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX instruction headers: by checking that the compiler is set to support those instructions besides verifying that QT_HAVE_3DNOW evalues to true (which only means the compiler supported them when the build was being configured). This has not caused a problem in most cases so far because GCC protects its mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check and can fail if -march is set to, for example, i386 or i486. Not backported from qt5 because qtbase because qsimd_p.h does not include the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ukrainian translation updateVictor Ostashevsky2013-05-105-14/+8
| | | | | | | Tiny fixes, mostly about copyright years. Change-Id: I9223eaabccb1ce93f1688f3512344dbcfb05aa6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix clang warning about bool to pointer conversion.Jędrzej Nowacki2013-05-102-2/+2
| | | | | | | | | | | The operation is legal from C++ perspective but only for "false" as it is guaranteed to be 0. Anyway returning 0 instead of "false" is logical and it follows coding style used in the modified functions. (cherry-picked from qt5 commit 50995e6936c5ca75a0a8a48c29bbbedd2cc60567) Change-Id: Ia09758e8d28599097f5c40eb24722890508afdbc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_memberSergio Ahumada2013-05-081-2/+0
| | | | | | | | | This test is now passing on all CI platforms. Change-Id: I526a92a2bd94fff03b58f63df0119db0d124ba18 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qtableview as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I4e1a95d66596b29a926a92dae325fd2fbb114d81 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qtimelineSergio Ahumada2013-05-081-2/+0
| | | | | | | | This test is now passing on all CI platforms. Task-number: QTQAINFRA-574 Change-Id: I6a536c7c4c33817544bff1d933d6f4a05f1631c2 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
generated by cgit v0.12 at 2024-11-16 22:30:06 (GMT)