summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove disabled code from QMainWindow autotest.Jason McDonald2011-10-311-9/+0
| | | | | | | | The removed code has been disabled since it was first added in October 2006. Change-Id: I10243aa2979fd1615c919ec522d10d77d6527b3b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unstable test from qgraphicsscene test.Jason McDonald2011-10-311-77/+0
| | | | | | | | | | | | The removed test was disabled in February 2007 because it did not work cross-platform. The comment that was added at the time claims that the functionality is covered thoroughly by other tests, but even if that isn't true we're not losing anything by removing this test as it is not even useful as a starting-point for a new test due to its reliance on random test data. Change-Id: Ica74262082184908d02595702486803d1efff4d2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete test data from qgraphicsitem testJason McDonald2011-10-311-19/+0
| | | | | | | | The removed test data was disabled by commit 83747a82 and should have been removed at that time. Change-Id: Ia2cef0bf4394a5b95fdf37db26369e733c7e86ec Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled code from qgraphicssceneindex testJason McDonald2011-10-311-36/+0
| | | | | | | | The removed code used to test API that was removed in the graphicsview refactor that was done for Qt 4.5.1. Change-Id: I3b312b9e51114e24c6ef1191353c35688b229d99 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled code from QString autotest.Jason McDonald2011-10-311-49/+0
| | | | | | | | | The removed code was disabled before the tests were imported into the Qt repository in 2006, so its meaning or usefulness is lost in the mists of time. Change-Id: I3108a1a1d86cd135886608f47dcd88bf49f2d3fd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled code from QRegExp testJason McDonald2011-10-311-6/+0
| | | | | | | | | The removed code was disabled before the tests were imported into the Qt repository in 2006, so its meaning or usefulness is lost in the mists of time. Change-Id: Iccdf5638106b054f02ed73790f7acda1b17b045b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove tests for API that never made it into Qt.Jason McDonald2011-10-313-151/+0
| | | | | Change-Id: If78d82abfb4ff3402eb8f36729bacc3c4d343d0c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from QChar autotest.Jason McDonald2011-10-311-14/+0
| | | | | | | | | QUnicodeTables::ligature() was removed from the API in 2006. The commit that disabled the test also changed the code to call QChar::ligature(), which has never existed. Change-Id: I056c17c178a527b076538fb007404ff0b735ba02 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from qstate autotest.Jason McDonald2011-10-311-145/+0
| | | | | | | | This was originaly the only test function in this test, and should have been deleted when it was replaced by the other test functions. Change-Id: Idc71a5462fd4d19955f9b14389b877be16c62ab5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve QBuffer autotestJason McDonald2011-10-311-3/+2
| | | | | | | | | | The documentation of QIODevice::pos() states: "For sequential devices or closed devices, where there is no concept of a "current position", 0 is returned". The test had a disabled check for a position of -1 before the device is opened. Make the test agree with the documentation. Change-Id: Ide5729bfc825cdb84caf4851574a57d3ef42ccb2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debugging code from QFileSystemWatcher testJason McDonald2011-10-311-15/+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: I201ba754df26ffc30997bead8b822f97913db2b6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove disabled tests from QUrl test.Jason McDonald2011-10-311-733/+1
| | | | | | | | | | | | Some tests were copied in from KDE's KURL sometime prior to Qt's tests being added to the Qt repository in June 2006. This was presumably done with the intention of making the tests work for QUrl, but that never happened and the copied tests have never been enabled. This commit removes the copied material. Change-Id: Ic35526f0018900bd60d7905646b24c62317b5e47 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from qtconcurrentiteratekernel test.Jason McDonald2011-10-311-44/+0
| | | | | | | The removed code refers to WhileIteration, which does not exist. Change-Id: I4c44bc319ac776d16ce9ba7b5c2938ce1642a3f6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete code from qtconcurrentrun test.Jason McDonald2011-10-311-71/+29
| | | | | | | | | The removed code was left over from an unfinished MSVC6 compatibility API (see commit e3e28e7a in the grafted history). That compiler is no longer supported, so this code can be retired. Change-Id: I81bcfa771ae13579f2458eb2d3ebf41c6af8577c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debug code from QLocalSocket autotest.Jason McDonald2011-10-311-7/+1
| | | | | | | | | 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: Ie44b6ea8dd496857ea264f730148d3dc4f5c8324 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debugging code from languagechange testJason McDonald2011-10-311-5/+1
| | | | | Change-Id: Ic3f1ea9ed3dd4ad78fccd66718f53a798cf8103a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove dead code from QTransform autotest.Jason McDonald2011-10-311-18/+0
| | | | | | | | | | Remove the operator_star_qrect() test function. The body of this test function has been inside "#if 0" since the commit that created the test in 2006 and the operator it is trying to test doesn't exist. Seems fair to assume that this function isn't worth keeping. Change-Id: I9748273b28eae4b07c3a25f77cee412ad94ea822 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debugging code from QPainter autotest.Jason McDonald2011-10-311-97/+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: Ic7fb619081e9ff453769f4064431dc726e90b985 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove debugging code from QPathClipper autotest.Jason McDonald2011-10-311-21/+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: I36c0624cccf70853a697a2395259b387fa334134 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove dead code from qpixmap autotestJason McDonald2011-10-311-6/+0
| | | | | | | | | The removed code was in #if 0 in the original commit of the test function and appears to be an earlier version that should have been discarded before the initial commit. Change-Id: I91f16aa7adcccb50f4f3a02062fb9d105d85000c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix use of qMax() with floating point constantsSergio Ahumada2011-10-302-3/+3
| | | | | | | | When passing floating point constants make sure to cast them as qreal's. Change-Id: I17e7ee407ac4f92ce947f6a384aa4d64edb8e983 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* moc: support c++11 style enumsOlivier Goffart2011-10-296-6/+118
| | | | | | | Task-number: QTBUG-21480 Change-Id: Ic116a5a06dd68036823f27146e49511c68cf2de6 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Remove S60/symbian specific codeLars Knoll2011-10-2957-51780/+5
| | | | | | | | Clean up and remove Symbian specific code and data. Change-Id: I89976fd087d485e04d37eccd3aeb3d2beac59b0a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Re-enabled tst_LargeFileJo Asplin2011-10-292-1/+3
| | | | | | | | | | | tst_LargeFile currently seems to pass in a stable way in CI It does have an issue on 64-bit Linux (see QTBUG-21175), so that test function is still disabled (QEXPECT_FAIL'ed) on that platform. Change-Id: I818046f84f2db5eb2155ae1f51f69581029bfaee Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove symbian threading primitive.Olivier Goffart2011-10-286-928/+3
| | | | | | | | | | | Those are already outdated and do not compile anymore (QMutex has changed too much) Better to remove that dead code so it do not show up in grep anymore Change-Id: I096e7a73e23cbb77050843c2e1c10929086fdb8f Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Correct dependencies for the platformsupport libraryLars Knoll2011-10-281-0/+1
| | | | | | | | | Without this make -jx would often fail as some of the dependencies of the platformsupport lib weren't built yet. Change-Id: I1e4fea5fa6f0dd5751b6b53458f1f14bfeb225b2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove stuff related to obsolete platformsLars Knoll2011-10-281-14/+0
| | | | | | | Qt/Embedded and Symbian are no longer supported. Change-Id: Ifb86a384c666f389a166efe798d4792115731adb Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove Windows and X11 from src/widgets/platforms.Robin Burchell2011-10-2882-52835/+10
| | | | | | | | | | This is dead code, unused with QPA in place, so remove it to avoid confusion caused through grepping for class names existing in both old and new places. Mac code is left in place for now, as some of it is still in use. Change-Id: Ia82cd5bbabe71285ca997f79d8fd9c0504e32c28 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Examples, plugins: Remove remains of qpa in profiles.Friedemann Kleint2011-10-284-19/+7
| | | | | Change-Id: I0fc45c6c4df6d1f07472aec30b9e64b55db8e543 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mark QAtomic* implicit cast and other operators as deprecatedBradley T. Hughes2011-10-281-0/+13
| | | | | | | | | | | | Add Q_DECL_DEPRECATED to all methods that are pending removal once http://codereview.qt-project.org/#change,6243 is merged. This is necessary to give people time to react to the source incompatible change. Change-Id: Ia72f184d630d593f96dd1d95ad6cd0d3bd5d811c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Get rid of legacy glTexParameterf calls.Samuel Rødal2011-10-289-75/+57
| | | | | | | | | | | ES 1.0 didn't have glTexParameteri, which is why we sometimes used glTexParameterf. However, we shouldn't use glTexParameterf because that's treating integer values as floating point, which is not type safe. ES 1.1+ and ES 2.x have glTexParameteri, and we don't really care about supporting ES 1.0 in any case in Qt 5. Change-Id: I6b586b31ddc418ba319c4cc88f6bb3978fdbd040 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Improve QTextBrowser unit test.Jason McDonald2011-10-281-0/+8
| | | | | | | | | The relativeLinks() test function was not performing sufficient verification steps and thus hid a regression. Task-number: QTBUG-22416 Change-Id: I2db4d4035e7a32f3c84630c7a15408d31d85ac9e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Move test data to the right place.Jason McDonald2011-10-281-0/+0
| | | | | | | | | | | This file seems to have been forgotten when the test it belongs to got moved -- probably because the test was poorly written and still passed when the file couldn't be opened. The file is supposed to live one directory up from the qtextbrowser test so that it can be used to test opening url's with relative paths. Change-Id: Id80965b1c73b37de75691ae3a18f909f9c6d799a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>