summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove redundant #if 1 from qdbusmarshall testJason McDonald2011-11-021-2/+0
| | | | | Change-Id: I5342210cda1f02950667621e5e64d65d6357c6ce Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove redundant code from qsortfilterproxymodel testJason McDonald2011-11-021-4/+1
| | | | | | | | | Remove a couple of "#if 1" directives (but not their contents), which have been present since before the tests were imported into the Qt repository in 2006. Change-Id: Id43aff37843e7a44ed96973f809de3838ba0e5b9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve QWidget autotest.Jason McDonald2011-11-021-5/+0
| | | | | | | Remove some "#if 1" directives and a line of debug code. Change-Id: Ib34f5b65470a24ee499799525ffe0645ccc117fe Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debugging code from qgraphicsitem autotest.Jason McDonald2011-11-021-6/+0
| | | | | Change-Id: Ia2ff65b5e980b42c5c64b957143860e94395d54f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unused code from qdbusmarshall test.Jason McDonald2011-11-021-32/+0
| | | | | | | | The removed functions have been unsued since at least as far back as 2006. Change-Id: Id1ea77dbfffa319c18891968f3aa378cfb563fd4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from qdbusmarshall test.Jason McDonald2011-11-021-6/+0
| | | | | | | | The removed code had been disabled since 2007 and tested functionality that was no longer supported. Change-Id: I49dfe58601c1cc6d41590ab2980daba27eca6bfb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from qdbuspendingcall testJason McDonald2011-11-021-33/+0
| | | | | | | The tested functionality hasn't been in the public API since 2008. Change-Id: I2898da3730fa6248eea2e19779b33ccc793b7a31 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled code in QItemView test.Jason McDonald2011-11-021-56/+0
| | | | | | | | | | The removed code was disabled in January 2007. The commit history does not make clear what the code was supposed to achieve and the code doesn't do what the comment at the top says (that looks like a TODO). Best to delete it and start again. Change-Id: I42b6b1d865c96518d74dc189a4a41d0d2776e5bc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Silence warning from clangBradley T. Hughes2011-11-011-1/+1
| | | | | | | | | | | | | | | | | The original intent was most likely to memset() the entire MD5Context to zero at the end of MD5Final(), which we do now. In file included from tools/qcryptographichash.cpp:49: ...qtbase/src/corelib/../../include/QtCore/../../src/corelib/tools/../../3rdparty/md5/md5.cpp:139:24: warning: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ~~~ ^~~ Change-Id: I793c6f0944b89c0e4c5f9253cdb1071175c17152 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove test that hasn't been enabled since 2007.Casper van Donderen2011-11-011-69/+0
| | | | | | | Task-number: QTBUG-22444 Change-Id: Id7569cf60cb314511a7d4f38833913c442f3fbba Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove remains of qpa in tests.Friedemann Kleint2011-11-014-4/+4
| | | | | | | Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Change-Id: I41aed5290df5aebeb30ebf5d2796aca6c65980d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix broken build.Jędrzej Nowacki2011-11-012-4/+5
| | | | | | | Variadic macros are not supported by C++98 standard. Change-Id: Ib520297e43b654b46925f3ee2735a975ebbe8e35 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add Q_PROPERTY declarations to QScreen.Samuel Rødal2011-11-012-19/+62
| | | | | | | | This means we can expose the API to QML in a simple way. Change-Id: Ibc36711071d288ed78ce833a64d6be2f22fc4b62 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Tentatively keep operator=(const QAtomic* &other)Bradley T. Hughes2011-11-011-2/+0
| | | | | | | | | | QAtomic* has a copy constructor, so it may make sense to allow assignment of one atomic variable to another. Change-Id: Ic754d13765080e2fcd13dc583940e354ad4404cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qeventdispatcher_win: Fix warnings about QAtomicInt.Friedemann Kleint2011-11-011-2/+2
| | | | | Change-Id: I2639fcee046ad3cc5de9c2635fdb6de4b757fc27 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Re-enabled passing tests in tst_qgraphicswidgetJo Asplin2011-11-012-1/+2
| | | | | | | | | | | To increase the effective test coverage, this patch re-enables the tst_qgraphicswidget test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: Ic484fde3492f077453f47a959dd6dc862288dcaf Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tst_qvariant: add a test QVariant works with not movable typesOlivier Goffart2011-11-011-0/+51
| | | | | | | | | | | Soon, QVariant will use more internal storage. It is important that it still work with not movable types Also, check with type that are movable but cannot be copyed without their copy constructor to be called such as QSharedDataPointer Change-Id: I6d67755476e4822468599bebfa8774ad96a15306 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Revert "Fix use of qMax() with floating point constants"Sergio Ahumada2011-11-012-3/+3
| | | | | | | This reverts commit 4e1b8720c1498edbb7a5bd37f622fdd3feb07850 Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Append -W* configure flags to QMAKE_C*FLAGS_WARN_ONBradley T. Hughes2011-11-011-3/+3
| | | | | | | | | | | ... instead of adding them to all C*FLAGS. This makes it possible to pass -Wno-warning-name to configure to disable certain warnings enabled by default (which didn't work previously). This also has the added benefit that only projects that have CONFIG+=warn_on will get the extra warning flags. Change-Id: I7bbc100155e02e7ccb9ac3be14bd8f585b7bc39b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove debug code from qsortfilterproxymodel testJason McDonald2011-11-011-12/+0
| | | | | | | | | Any test diagnostics that are useful should be part of the regular test output, as the CI system cannot switch on commented-out code when there is a test failure. Change-Id: I80691b274d9d2abda72bca894ace9de545410ed8 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve QWidget autotestJason McDonald2011-11-011-6/+6
| | | | | | | | | There are two cases where a QCOMPARE may fail on some platforms. Rather than disabling the QCOMPAREs with "#if 0", use QEXPECT_FAIL so that we can look in the CI logs to see which platforms fail. Change-Id: Ife93c8032e01a04e8068bf213e2040778c12f711 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debug code from QLayout autotest.Jason McDonald2011-11-011-4/+0
| | | | | | | | | Any test diagnostics that are useful should be part of the regular test output, as the CI system cannot switch on commented-out code when there is a test failure. Change-Id: Id4efb74a2d3646f3554b643762beefba113c3602 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debug code from QGridLayout autotestJason McDonald2011-11-011-4/+0
| | | | | | | | | Any test diagnostics that are useful should be part of the regular test output, as the CI system cannot switch on commented-out code when there is a test failure. Change-Id: Ifd2bbd17677e16ddb0f1846287d722cdae76d984 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test.Jason McDonald2011-11-011-8/+0
| | | | | | | | | The commit that disabled this test a few days after it was originally comitted (bda80c4b in the grafted history) makes it clear that this test was never valid. Change-Id: Ib0090fc35d0b9251d7b7367de2c71a66a332c567 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve QMenu autotest.Jason McDonald2011-11-011-20/+24
| | | | | | | | | | | Originally this commit was just going to reinstate the disabled line of test data (after correcting it to use keyboard modifiers instead of invalid bitwise-or of key-codes, which would trigger an assert in qtestlib). Unfortunately, this revealed a minor bug in QMenu, as reported in QTBUG-22449, so a QEXPECT_FAIL has also been added. Change-Id: I29699fcbfa353c037a83379a6140f0e3da5be027 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove S60/symbian specific code in plugins/bearerLiang Qi2011-11-0111-3617/+0
| | | | | | | Clean up and remove Symbian specific code and data. Change-Id: Icef41c22f143278a66f6a46ca80c495d083bf9a9 Reviewed-by: Alex <alex.blasche@nokia.com>
* Use QAtomicInt::store() instead of operator=(int)Bradley T. Hughes2011-11-011-2/+2
| | | | | | | ... since the latter is now deprecated and will be removed. Change-Id: I456c1bf93ebf119c028bc4a63f1f8a31f069b83b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixes to the ibus input contextLars Knoll2011-11-012-4/+35
| | | | | | | | | Adjust to changes in the QPlatformInputContext and implement commit(). Fix a bug that caused the cursor to be hidden after the first commit. Change-Id: I85e59a72766d1180a54df412cf33beb653af4e7b Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove S60/symbian specific mkspecLiang Qi2011-11-0144-1287/+0
| | | | | | | | Clean up and remove Symbian specific mkspec. Change-Id: I0fa75287720db92983422611e0090301d06814ec Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove S60/symbian specific code in corelib/archLiang Qi2011-11-0114-7469/+1
| | | | | | | | | Clean up and remove Symbian specific code and data. Change-Id: I41794085fd5122310b1fdf4c524c6e77d22e8500 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Improve QMenu autotestJason McDonald2011-11-011-2/+5
| | | | | | | | | The test for keyboard navigation was only checking correct highlighting when a menu item was not activated by the latest key-click. It should also check that no item is highlighted after an item is activated. Change-Id: I443e154be5cdc2def4f12d3f0abab2cc1bc6e4a8 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* HTTP proxy engine - accept standard Connection headerShane Kearns2011-10-311-0/+4
| | | | | | | | | | | | The Proxy-Connection header is a non standard header, but is widely used so forming a de-facto standard. Some proxies use the official Connection header, so we should check for that in responses. Otherwise https connections over http proxy fail in case the proxy sends "Connection: close" with the 407 reply. Task-number: QTBUG-22177 Change-Id: If6cfa4ebb7ac9d97d65b6ddcc8257aee20ac0448 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
| | | | | | | | (cherry picked from commit 9d5c920bb23b949a0b98f1268679a0a2c06dd1d9) Change-Id: Id99040051afe97bca3b1a8e4e3ae5a4c7f617cc9 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* mkspecs: Remove qpa conditionals.Friedemann Kleint2011-10-312-4/+1
| | | | | | | Preparing removal of -qpa from configure. Change-Id: Id2f784206f97729c739cf20504a2a9428ddc1cce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update enums in documentation.Casper van Donderen2011-10-311-1/+2
| | | | | Change-Id: Ic48051cc832dc8bc06df2e82c54388df60208e39 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Reimplement GLTexture::failed() properly in GLRenderTargetCubeBradley T. Hughes2011-10-311-1/+1
| | | | | | | | The GLRenderTargetCube::failed() method needs to be const. Change-Id: I9bfa031e284b62c86a9be786aea3b851582b71f4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add file from qtdoc.Casper van Donderen2011-10-311-0/+51
| | | | | Change-Id: I0e76b1eb0195a621ca3888e2194bdd7fd10f6251 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove Symbian support from bind enum documentation.Robin Burchell2011-10-311-7/+0
| | | | | | | | Symbian is no longer a supported platform. Change-Id: Ifcb2e05661b16acc6307a4ccfaa42586750734c1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Move support for socket binding from QUdpSocket upstream to QAbstractSocket.Robin Burchell2011-10-315-171/+212
| | | | | | | | | This should be API-compatible with Qt 4, but is not ABI-compatible, due to removing the enum from QUdpSocket. Task-number: QTBUG-121 Change-Id: I967968c6cb6f96d3ab1d6300eadd5bde6154b300 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Set localAddress and localPort on socket binding.Robin Burchell2011-10-312-0/+6
| | | | | | | | | This should have always been the case, as it simply makes sense, but the upcoming moving of binding to QAbstractSocket will require this for autotesting. Change-Id: Ieef70196616227e7914c76fff5388a4068c36efb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Remove declaration of QRasterPlatformPixmap::fromFile()Bradley T. Hughes2011-10-311-1/+0
| | | | | | | | | | | | | | | | | | | | | This function is not implemented, and the declaration hides the virtual QPlatformPixtmap::fromFile(): ../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/image/qpixmap_raster_p.h:70:10: warning: 'QRasterPlatformPixmap::fromFile' hides overloaded virtual function [-Woverloaded-virtual] void fromFile(const QString &filename, Qt::ImageConversionFlags flags); ^ ../../include/QtGui/../../src/gui/image/qplatformpixmap_qpa.h:90:18: note: hidden overloaded virtual function 'QPlatformPixmap::fromFile' declared here virtual bool fromFile(const QString &filename, const char *format, ^ Change-Id: Iedbc4acd9f9218f8fe72a44a9eff6a35b5494d75 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Move QPrinter::init() to QPrinterPrivate::init()Bradley T. Hughes2011-10-313-14/+13
| | | | | | | | | | | | | | | | | | | | | | | This method is private, and only called from the QPrinter constructor. This also removes warnings about overloading the virtual QPaintDevice::init() method interitted form QWidget: ../../include/QtPrintSupport/../../src/printsupport/kernel/qprinter.h:259:10: warning: 'QPrinter::init' hides overloaded virtual function [-Woverloaded- void init(PrinterMode mode); ^ ../../include/QtGui/../../src/gui/painting/qpaintdevice.h:93:18: note: hidden overloaded virtual function 'QPaintDevice::init' declared here virtual void init(QPainter *painter) const; ^ Change-Id: I7c5203a1264b0ad825ed4075b66017fef22a40fb Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Doc: Fixing typosSergio Ahumada2011-10-3127-50/+50
| | | | | Change-Id: I445b4cb0fe88d775c9421fbf1e8b7bb76dec0fc4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Re-added hellogl_es and ES 1 support for QOpenGLContext.Samuel Rødal2011-10-3111-6/+492
| | | | | Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QRecursiveMutexPrivate should not inherit from QMutexPrivateOlivier Goffart2011-10-317-49/+55
| | | | | | | | QMutexPrivate takes more memory than necessary, and also initialize platform specific ressources. Change-Id: I70be1b89b1c21499645785ae47693a6b2514e28b Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Rename QBasicMutex::d to QBasicMutex::d_ptrOlivier Goffart2011-10-313-26/+26
| | | | | | | | | Because we use d as a local variable. We used this->d to refer it, but this can be confusing to have twice the same name Change-Id: I570aa5f444ada358eb456d6b3d9b8bfa60b10bbf Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Add missing include when enabling deprecated codeOlivier Goffart2011-10-311-0/+4
| | | | | | | | QStringList is used by the inline code. (I did not see that before because I was using precompiled headers) Change-Id: Ieea4f13c143495f841b5246d835b584cc7404ac6 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Gui/OpenGL: Remove remains of qpa from profiles.Friedemann Kleint2011-10-313-71/+47
| | | | | Change-Id: Iff2531a19030bd782ee4cd9bbe529d18666503f9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix most warnings about assignments of QAtomicInt.Friedemann Kleint2011-10-3120-66/+52
| | | | | Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Correctly handle null windows or widgets in keyClick()Lars Knoll2011-10-312-0/+13
| | | | | | | | | | Allow passing of null windows or widgets to keyClick(). In that case route the event through the normal Qt event processing. This allows e.g. shortcuts to catch the key event. Change-Id: Ic9455ea9be5164918b1c0bccbd58dd32eae74ff1 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>