summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename QPixmapData to QPlatformPixmap.Samuel Rødal2011-07-1992-823/+639
| | | | | | | | | Makes the API symmetric with the other Lighthouse APIs. Change-Id: I8a399f3c968ea35d4624711b31f2ac5bb94b7893 Reviewed-on: http://codereview.qt.nokia.com/1735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Images: Implement internal DIB image plugin.Friedemann Kleint2011-07-194-7/+37
| | | | | | | | | | | For use for clipboard/DnD operations on Windows by its Lighthouse plugin (to prevent having to export qt_read_dib(), qt_write_dib()). Change-Id: I79e69bf7cecb16cc47ea29de6805fc52e4df1007 Reviewed-on: http://codereview.qt.nokia.com/1714 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* Get rid of some obsolete functions in QImage / QPixmap / QPixmapData.Samuel Rødal2011-07-1816-762/+204
| | | | | | | | Change-Id: I0d2412c9196475b926a17de9fcc3281f6625fae0 Reviewed-on: http://codereview.qt.nokia.com/1733 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Merge remote-tracking branch 'origin/master' into refactorLars Knoll2011-07-1331-502/+1039
|\ | | | | | | Change-Id: I53c78056abde99198ffe1c67f7f9e90b4b08051d
| * Fix compilation on MSVCLars Knoll2011-07-132-17/+51
| | | | | | | | | | | | | | | | | | | | | | MSVC apparently doesn't like the way the QString::Data pointers got initialized. Also fixed a few warnings about signed/unsigned conversions. Change-Id: I1267979af7601129e5483f8785d4982a1f2f8182 Reviewed-on: http://codereview.qt.nokia.com/1558 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Fix a crash with QGraphicsScene.Pierre Rossi2011-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It happened when the scene gets deleted after ~QApplication has been called. test case: int main(int argc, char *argv[]) { QApplication a(argc, argv); QGraphicsScene *scene = new QGraphicsScene(&a); return 0; } Change-Id: I74d4023c9575242a2e334b2c786e00d0686c452b Reviewed-on: http://codereview.qt.nokia.com/1544 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| * Fix uses of qRound on non-floating-point types.Thiago Macieira2011-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | It's silly to round integeres, since they are already round. At most, this would waste CPU cycles without any benefit. Change-Id: I6fc0152f4416d723b65966e5d48cc7a07957b83c Merge-request: 17 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1541 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Fix compilation with icc 11Olivier Goffart2011-07-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Rvalues reference are not supported by icc11 yet. Disable all C++0x feature on that compiler. Task-number: QTBUG-19979 Change-Id: Ifca939b18aa933b047883584cdf91f5543b852b5 Reviewed-by: Thiago Reviewed-on: http://codereview.qt.nokia.com/1535 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * QNAM HTTP: Re-write compression codeMarkus Goetz2011-07-126-249/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates some code (header parsing) that can be done by zlib already. Add support for 'deflate' encoding. Also do less memory copying while uncompressing. Change-Id: I94de21e3c58b904dd91d004c375ed8cbea56cb0b Task-Number: QTBUG-13191 Reviewed-on: http://codereview.qt.nokia.com/1314 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-by: Markus Goetz
| * Add the #defines for C++0x features in GCC 4.6Thiago Macieira2011-07-121-0/+10
| | | | | | | | | | | | | | | | | | | | Merge-request: 8 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Change-Id: I9176f53bd98692c31e49d1d98f91641661a52044 Reviewed-on: http://codereview.qt.nokia.com/1522 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * QNAM HTTP: Do zero-copy for small HTTP replies by defaultMarkus Goetz2011-07-123-9/+22
| | | | | | | | | | | | | | | | | | | | Task-Number: QTBUG-19046 Change-Id: I34bf432c81d94787524124b7d110a00305a660c1 Reviewed-on: http://codereview.qt.nokia.com/1516 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * QSslCertificate: extend documentation for new verify methodPeter Hartmann2011-07-121-2/+6
| | | | | | | | | | | | | | Change-Id: I47e038299a7e6ef18206839ff59ecef9f0860415 Reviewed-on: http://codereview.qt.nokia.com/1510 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz
| * Add the ability to verify a chain of certificatesRichard Moore2011-07-1214-26/+547
| | | | | | | | | | | | | | | | | | | | | | Currently it is only possible to verify a certificate chain when connecting to a server. This change makes it possible to verify a chain at any time. Change-Id: Ib70ad7b81418f880e995f391b82ce59561ededb8 Merge-request: 11 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1509
| * Refactor QByteArray to allow for const dataLars Knoll2011-07-123-188/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | Similar refactoring as done for QString. Make shared_null read-only, and add support for compile time generated QByteArrayData. Add support for properly reserving capacity. Change-Id: Ie4c41d4caac7b3b4bb1aef40c1c860a30b82edb8 Reviewed-on: http://codereview.qt.nokia.com/1484 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Cleanup reference counting in QDateTimePrivate class.Jedrzej Nowacki2011-07-121-3/+2
| | | | | | | | | | | | | | | | | | | | It is better to use QSharedData which is a common interface for ref counting. Change-Id: I990476d6763901bf383f241bce16fe26665b021c Reviewed-on: http://codereview.qt.nokia.com/1439 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Added macro to check if the malloc hooks should be volatile.Christian Strømme2011-07-121-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The malloc hooks changed in glibc 2.14, and are now volatile. Note also that the malloc hooks are now marked as deprecated. Ref: http://sourceware.org/bugzilla/show_bug.cgi?id=11781 http://repo.or.cz/w/glibc.git/commitdiff/a33c44639a8784589c8386ac0b56baf6d0beca32 http://repo.or.cz/w/glibc.git/commitdiff/cf6bbbd701380accba8f709cf88b7bb160131e32 http://repo.or.cz/w/glibc.git/commitdiff/7d17596c198f11fa85cbcf9587443f262e63b616 Change-Id: Iab80bea7a7f5d72ac96cacd75468eefbfd9b8326 Reviewed-on: http://codereview.qt.nokia.com/1497 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge "Merge remote branch 'gerrit/master' into refactor" into refactorLars Knoll2011-07-12141-2667/+1648
|\ \
| * | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-12141-2667/+1648
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
| | * remove unneeded cast operator on QConstStringDataLars Knoll2011-07-121-3/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5f090cd6c716e1d936894be206b78629e70137b Reviewed-on: http://codereview.qt.nokia.com/1487 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Introduce QT_DEPRECATED_SINCEOlivier Goffart2011-07-122-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be used to versionize deprecated symbols Symbols deprecated in Qt 5.0 need to be inlined Change-Id: I696a834c25b7e86acf14ae081ea91ef993a5b19e Reviewed-on: http://codereview.qt.nokia.com/431 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Add autotest for QStringLiteralLars Knoll2011-07-121-0/+26
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5a82bf3bf489373bc0823065aa9c2990430440c Reviewed-on: http://codereview.qt.nokia.com/1486 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * Compile with C++0x enabledLars Knoll2011-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: Iffee297c6bc3a53a95cd42fe6ad8901d7b791a11 Reviewed-on: http://codereview.qt.nokia.com/1485 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * QSslCertificate: rename "tag" to "attribute", as in the RFCPeter Hartmann2011-07-123-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 2459 "Internet X.509 Public Key Infrastructure" uses the word "attribute" for fields in a certificate like common name, organization etc. Change-Id: I51e595acbe3e146acf81af21cf48e554fa9490e4 Reviewed-on: http://codereview.qt.nokia.com/1453 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| | * fix $$resolve_depends()Oswald Buddenhagen2011-07-111-24/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make it a proper topological sort. before, it could not resolve diamonds correctly. Change-Id: I17ffd81020ab36e7e5dbcfd120793ba8d9c6cf18 Reviewed-on: http://codereview.qt.nokia.com/1435 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * inline resoveDepends()Oswald Buddenhagen2011-07-112-20/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | that's common practice for the expand functions, and that one isn't even particularly big Change-Id: I66c22e11edb66bd00d211fc1282eb75f5dd4832d Reviewed-on: http://codereview.qt.nokia.com/1456 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * fix misnomer: $$resolve_depends() => $$sort_depends()Oswald Buddenhagen2011-07-113-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... and re-add a real $$resolve_depends(), just in case. Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7 Reviewed-on: http://codereview.qt.nokia.com/1455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * invert the output order of $$resolve_depends()Oswald Buddenhagen2011-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it needs to go from highest order to lowest order. that's not relevant unless doing static linking. Change-Id: Ieb69e3949b4d9cc2d2a62f5661f31e3dc88ac882 Reviewed-on: http://codereview.qt.nokia.com/1454 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * make 1st argument of $$resolve_depends a variableOswald Buddenhagen2011-07-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is braindead, but it's consistent with the rest of qmake and more performant. and the argument error message claimed it already anyway. Change-Id: I973368acc6ffbff17107085ccd68b0334cc3e681 Reviewed-on: http://codereview.qt.nokia.com/1436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Cleanup reference counting in internal::Base class (qtconcurrent)Jedrzej Nowacki2011-07-112-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is better to use QSharedData and QExplicitlySharedDataPointer then doing manual ref counting. Change-Id: I5674046141701bd48a53415ab96fcb6b538e79e6 Reviewed-on: http://codereview.qt.nokia.com/1440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Cleanup reference counting in QIcon classJedrzej Nowacki2011-07-113-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is better to use QSharedData and QExplicitlySharedDataPointer then doing manual ref counting. Change-Id: Icbb06d92102bcc906291238c5895a05e8d0e6de1 Reviewed-on: http://codereview.qt.nokia.com/1438 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * SSL: Move the code for extracting the name of an ASN1_OBJECTRichard Moore2011-07-112-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the code for extracting the name of an ASN1_OBJECT to a function. We're going to need this again for implementing support for X509 extensions. Change-Id: I43276eb375b37f5fef0d981f4003220d7e7b81ba Merge-request: 18 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1452 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * SSL: Add methods to access the tags of the subject and issuer of a certRichard Moore2011-07-115-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add methods that return a list of the tags in use in a certificate issuer or subject. This means that unknown elements of these fields can be accessed. Change-Id: I588989e34f541b1d31cc9e97f5a85d1624ece1b1 Merge-request: 18 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1451
| | * SSL: Make the internals of certificate name info match the externals.Richard Moore2011-07-112-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internals of QSslCertificate were using QString but the API used QByteArray, this commit unifies the code. This means that we don't keep converting things. Change-Id: I29fc149a85b77e786a6e90e5154c62f713476599 Merge-request: 18 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1450 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * SSL: Store x509 name entries that have no short name as their OID.Richard Moore2011-07-113-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, x509 name entries that didn't have a shortname would all be (accidentally) stored with the tag 'UNDEF'. This commit changes things so that they are stored using the string form of their OID. Change-Id: I667306cc4f91b1ca84f29b986bc21daadeb089b6 Merge-request: 18 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1449 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * SSL internals: rename methods in the SSL backend to reflect public onesPeter Hartmann2011-07-113-6/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: I234c740b1acbfea670d6170332626f5e3ba49328 Reviewed-on: http://codereview.qt.nokia.com/1437 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| | * make the non-bootstrapped build work againOswald Buddenhagen2011-07-112-0/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: I48d33bea7fd3081461e6edcf7077bfb749e2d2b7 Reviewed-on: http://codereview.qt.nokia.com/1433 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Remove #ifdef for platforms where QChar was packed -- there aren't anyThiago Macieira2011-07-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ARM OABI, sizeof(QChar) was 4, so we used to pack it so QChar[] was isomorphic to ushort[]. We don't support the OABI anymore and the EABI does the right thing. Change-Id: I181dd2f169f6868450302e269ef9ad5d643f306f Merge-request: 13 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1386 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * QNAM: Remove QNetworkAccessHttpBackendMarkus Goetz2011-07-115-1362/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.0 is using QNetworkReplyHttpImpl Change-Id: I230230dc8b81e55a6c0cc8e1d85714e49fd35d17 Reviewed-on: http://codereview.qt.nokia.com/1381 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| | * Replace try/catch blocks in favour of destructors in the event loop.Thiago Macieira2011-07-113-141/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has two direct benefits: 1) compiles regardless of -fno-exceptions: no need for #ifndef QT_NO_EXCEPTIONS or QT_TRY/QT_CATCH 2) no QT_RETHROW either, which means the backtrace of an application crashing due to an uncaught exception will include the actual throw point. Change-Id: I18e5500e121bfa81431ef16699df96d962794f0e Reviewed-on: http://codereview.qt.nokia.com/663 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Remove some metrics parsing code from Core TextJiang Jiang2011-07-112-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The respective value in some of the default fonts like Lucida Grande are simply not reliable. It seems that the only reliable way to get such information is by going through all the glyphs. It seems that these code are not well tested on Mac and should be removed for now since it caused visible regressions in QLineEdit rendering. Reviewed-by: Eskil (cherry picked from commit 8032d6f4ced50837e126f28c1475ad89eaf91ad7) Change-Id: I85e71a2e3228a367659be9f5f6ec3e667e0ce902 Reviewed-on: http://codereview.qt.nokia.com/1264 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| | * Add font related changes in 4.8 into changesJiang Jiang2011-07-111-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil Change-Id: I2371fab17201ffd157753d36bc7e2e0c59cc2376 Reviewed-on: http://codereview.qt.nokia.com/1265 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| | * QSslSocket: Add accessors for SSL versionRichard Moore2011-07-117-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds accessors for both the openssl version number and the version string. The intention here is to aid debugging by making it possible for applications to know which version of the openssl library has been found by the runtime linking code. Since the version of openssl in use will depend on the installation of the developer, the test cases merely display the version string and number rather than verifying that any particular version is in use. Change-Id: Ieec44f0941f99887c85c2858bab0481722d739e5 Merge-request: 12 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1406 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * Remove Qt 4.3 binary compatibility for MSVCThiago Macieira2011-07-115-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed the useless "const" in the return type, we broke compatibility with a few compilers that include the return type in the mangling. We don't need that anymore in Qt 5. This change should have had a ### Qt5 mark everywhere, not just in a comment in qstring.cpp. Change-Id: I8839f8dc540b34e57a3efdb160a1c015f7328422 Merge-request: 13 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1385 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * Remove the definition of QT_NO_FPU based on the processor or WSThiago Macieira2011-07-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The definition is just wrong these days. Modern ARMv7 and MIPS have FPUs. Maybe AVR32, SH or SH4A don't, but then QT_NO_FPU should be defined in the qplatformdefs.h for those platforms. More importantly, since QPA is the only supported architecture for Qt 5, we definitely don't want to say that no platforms have no FPU. Still let qreal be defined to float on ARM, though: on Cortex-A8, which is the current norm these days, float performance is better than double performance. Change-Id: I89e01c10c59fbe95840a668ec9736846d23258fb Merge-request: 16 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1383 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| | * Use lambdas for generating static data for QStringLiteralThiago Macieira2011-07-111-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means it will work on C++0x compilers that support lambdas (all of them once they've completed supporting the functionality). Olivier had the idea and the initial code. Change-Id: I11ef7da4058ed18f4ea99ada070891a68ed54f55 Reviewed-on: http://codereview.qt.nokia.com/1380 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * Remove more references to demos.Casper van Donderen2011-07-0831-72/+38
| | | | | | | | | | | | | | | | | | | | | Change-Id: I431184cd0534c86047706fdaa1045b2935de5d7a Reviewed-on: http://codereview.qt.nokia.com/1307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| | * Fix memory leak in QHostInfoShane Kearns2011-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHostInfo was leaking in the code path where it removes duplicate name lookups after one has completed. Task-number: QT-5121 Reviewed-by: Markus Goetz (cherry picked from commit 73df7890923f377f19147466d9317fe1ec064b1d) Change-Id: I26cc6a168ef8ea6cc18940300ca2eddd6777071d Reviewed-on: http://codereview.qt.nokia.com/1363 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Markus Goetz
| | * Remove the qs() macro.Olivier Goffart2011-07-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is tootoo many risks of conflicts with existing code. QStringLiteral is not that hard to type. And if users want to use qs they can still define it in their own headers. Change-Id: I7da4772d902033fa163f5177c012b5d0e87332d7 Reviewed-on: http://codereview.qt.nokia.com/1357 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Use memmove in QListData::append(int) as regions overlap.Thiago Macieira2011-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's undefined behaviour to memcpy regions with overlapping area. You have to use memmove. Change-Id: I912c819bf7ab26ba1e60028ee9d7c833dfc5138a Reviewed-on: http://codereview.qt.nokia.com/1355 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| | * QNAM: Add support for more KnownHeadersMarkus Goetz2011-07-083-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-Number: QTBUG-17267 Change-Id: I32b41d26411ee3a7162bb658d69363a5eeb37230 Reviewed-on: http://codereview.qt.nokia.com/1327 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>