summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove the freebsd-g++34 mkspec.Raphael Kubo da Costa2012-04-172-126/+0
| | | | | | | | | | | GCC 3.4 is older than the 4.2.1 in the base system, and should be removed from the ports tree. Besides, nobody in their sane mind would want to build Qt with such an old compiler. Change-Id: Ib40357758058505465a8bfcefbd182b9240591a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-9/+0
| | | | | | | | | | | | QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or >= 4, branched in early 1999. FreeBSD < 7 is not supported by the upstream project anymore, so we can simplify the code and rely on the QT_SOCKLEN_T definition in common/posix/qplatformdefs.h instead. Change-Id: I0e06fc37e29158932b95a2619a7442c6068a7d32 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove insignfication from QGuiApplication test on Windows.Jason McDonald2012-04-172-2/+6
| | | | | | | | | | This test has two stable failures, one of which slipped through while the test was disabled. Mark the failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-24186 Change-Id: Ie24f86603a01634d6eec5a42baa77e966f9388c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix a thread safety issue with QTextLine::glyphRunsPierre Rossi2012-04-171-1/+7
| | | | | | | | | | | This is a very partial revert of 10ac80708. Revert back to using engineFromScript, which is reentrant, for cases other than the "rawfont mode". In that last case, reentrancy is not a big issue so far as the only client is WebKit, and this is used in the web process, with no threaded rendering. Change-Id: I047b04cf0236d52e6d548f34cddd3dcc7c3c5f83 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix memory leak of QFontEngineDataJian Liang2012-04-171-4/+4
| | | | | | | | | | | | | | | Move QFont::cleanup(); and cleanupThreadData(); to the end of destructor of QGuiApplicationPrivate class. This is because they will trigger the QFontCache::~QFontCache() function being called and at that time the platform_theme object still hold some fonts object, This will cause the QFontEngineData object hold by those fonts can never been deleted. Change-Id: I4d3f21c5e2683706f68395ba3ad24203081e1d1d Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Add function getters in the native interfaceJørgen Lind2012-04-172-0/+33
| | | | | Change-Id: I4609071e38c3807479375ef98f260516da03ec15 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* QDoc: Write subclasses of namespaces in automatic ditamap.Casper van Donderen2012-04-171-13/+22
| | | | | | | Now we also write the subclasses of namespaces sorted to qt.ditamap. Change-Id: I4a4376bac208b9bacd5a2ddd5265faef13dc2eba Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Add some missing \internal for accessibilityJan-Arve Saether2012-04-171-0/+1
| | | | | Change-Id: I42c0a14908cfcccd2218f887b286515fef8d6611 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-173-6/+20
| | | | | | | | | | | This is a regression introduced by commit 22b7d211865c1505862627a2e65bcd063e314e45. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: I3f3bfe23af802444b078a29ee5565dd2bd24a34d Reviewed-by: David Faure <faure@kde.org>
* Merge "Merge remote-tracking branch 'origin/api_changes'" into ↵Lars Knoll2012-04-17583-23704/+28379
|\ | | | | | | refs/staging/master
| * Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-17583-23704/+28379
| |\ | | | | | | | | | Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
| | * Skip tests toolbar-dialog/widget_window.Friedemann Kleint2012-04-172-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | To enable merging the api_changes branch. Task-number: QTBUG-25331 Change-Id: I90d32ca0bd96eed62bae5f01316d6360a3b435c8 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| | * Merge "Merge remote-tracking branch 'origin/master' into api_changes" into ↵Sergio Ahumada2012-04-17378-3780/+6339
| | |\ | | | | | | | | | | | | refs/staging/api_changes
| | | * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-16378-3780/+6339
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
| | * | | api: remove QWindow::moveGirish Ramakrishnan2012-04-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWindow::setPos is the correct api. Change-Id: I5439338e9bc6933800d66331f20ce554b017c4fb Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | api: Fix const correctness of api in QScreenGirish Ramakrishnan2012-04-172-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | const was missing in many convenience functions. grabWindow should not be const since it actually does something. Change-Id: I0ffa718878d4251c4fb5c34789cf58ebb85cff37 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | api: Make QGuiApplication::styleHints() staticGirish Ramakrishnan2012-04-172-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Practically all functions in QGuiApplication are static. Change-Id: I5948620865c021029a3c04b31901b1110e6c0d27 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | Fix tst_qtracebench benchmark.Jędrzej Nowacki2012-04-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default QDataStream version was changed in Qt5, but the test tried to load an old dumped file. Change-Id: I49c06c232ec8a27f33c9da345bae4e03cd0c56fb Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | Update parent indexes first with changePersistentIndex.Stephen Kelly2012-04-172-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the order of updating of the indexes will cause inconsistent results because it will rely on ordering within a QHash (which is indeterminate). Task-number: QTBUG-25325 Change-Id: I7d99578c8ee2954b8562dc5aff7dc32e74d41fb5 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | | Make reallocData use QArrayData::AllocationOptionsJoão Abecasis2012-04-162-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Growth computations are deferred to QArrayData::allocate, except in the case of realloc as that functionality is currently lacking in QArrayData. Since that sits in library code, anyway, it can be changed later to use a future QArrayData::reallocate. As it is, reallocData is becoming a model for QArrayData::reallocate and what it can offer to containers of POD/movable types. Change-Id: I045483f729114be43e4818149d1be1b333bcbe13 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | | Drop unnecessary assignmentJoão Abecasis2012-04-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this branch, !IS_RAW_DATA has already established that offset is sizeof(QByteArrayData) and realloc maintains the assumption. Change-Id: Ic160e36d7781d4c4f64a3b2ebec98c9cb605b3eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * | | Migrate QByteArray over QArrayData.Jędrzej Nowacki2012-04-162-60/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the time being QByteArrayData keeps its independent existence, for the sake of other modules. Once they have been ported to use the new initializer macros it can be changed to: struct QByteArrayData { QArrayData array; }; Extra braces can then be added to the macros. With respect to source compatibility, the only concern is with other modules, as QByteArrayData has already changed in incompatible ways with Qt 4.x Done-with: João Abecasis Change-Id: I044e2a680317431777a098feec8839a90a3d3da3 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | | Remove explicit checks for shared_null/emptyJoão Abecasis2012-04-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eases porting to QArrayData and retains semantics. In append() and prepend() a conditional was generalized so that no work is done if there is nothing to add. Done-with: Jędrzej Nowacki Change-Id: Ib9e7bb572801b2434fa040cde2bf66dacf595f22 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * | | Make QByteArray and QString keep track of terminating nullJoão Abecasis2012-04-164-46/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In conceptual terms, this change increments the Data::alloc member by one for all strings allocated and maintained by these classes. Instances initialized with fromRawData retain 0 as the member value, so they are treated as immutable. This brings QByteArray and QString closer to QVector, making it possible for them to reference and share the same data in memory, in the future. It also brings them closer to QArrayData. In practical terms all comparisons to the alloc member were changed to take into account that it also tracks the terminating null character. Aside from the increment in the alloc member, there should be no user visible changes. Change-Id: I618f49022a9b1845754500c8f8706c72a68b9c7d Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | | Show the type and address of QObjects in debug output.Stephen Kelly2012-04-162-1/+13
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I9f44ab80a6fb763adc9cbaf47de8e1b97212332d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * | api: fix constness of QOpenGLContext::getProcAddressGirish Ramakrishnan2012-04-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be const just like Qt4's QGLContext::getProcAddress. Change-Id: I273467d5cf852cd49f48cec3f335c4ddac795363 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| | * | Update com.trolltech -> org.qtproject in the bootstrapped toolsThiago Macieira2012-04-162-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tools will now generate the new org.qtproject annotations only, matching the XML generator in the library. They accept both types of annotations as input though -- and will generate a warning about the older one. This commit should be backported to Qt 4, so XML files can start to be ported. Task-number: QTBUG-23274 Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
| | * | Introduce the new UnknownProperty and PropertyReadOnly errorsThiago Macieira2012-04-163-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those error codes have been standardised for years but we haven't used them until now. Task-number: QTBUG-23274 Change-Id: Iebc9ded949f363281a4d43fd9d29a284f2e2df08 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
| | * | Finish cleaning up com.trolltech -> org.qtproject in QtDBusThiago Macieira2012-04-1626-76/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of uses of the annotations and error names, plus a bunch of local unit test names (including one file that had to be renamed). The meta object generator is updated to support both the old and new names. That means some references to com.trolltech *must* remain in the source code. Task-number: QTBUG-23274 Change-Id: Icc38ae040232f07c437e7546ee744a4703f41726 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
| | * | Update the error codes in QtDBusThiago Macieira2012-04-164-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the old com.trolltech ones to org.qtproject and introduce Use the alternate domain name for the Qt Project because the dash character is not valid in interface and error names. Task-number: QTBUG-23274 Change-Id: Iac1699e70525d67f983c10560932acff6b2ecde6 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * | Mark tst_qabstractitemmodel as insignificant after QHash randomizationGiuseppe D'Angelo2012-04-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The testChildrenLayoutsChanged fails randomly. This happens rarely, f.i. wasn't spotted by CI when QHash randomization itself was merged; but is indeed reproducible by running the test a few times in a row. This is now blocking api_merges integration, and I have no idea how to fix it. This patch marks the test as insignificant for now (the bug tracking this test failure is QTBUG-25325), and switches the failing tests from QVERIFY(a == b) to a proper QCOMPARE (so that the expected values do show up in the build logs). Change-Id: I16f0e28bcbb06dbac2e7169f4676a19ccf626a92 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | QHash security fix (2/2): enable QHash random seedGiuseppe D'Angelo2012-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Algorithmic complexity attacks against hash tables have been known since 2003 (cf. [1, 2]), and they have been left unpatched for years until the 2011 attacks [3] against many libraries / (reference) implementations of programming languages. This patch makes qHash use the QHash seed introduced in the previous commits, thus truly randomizing bucketing in QHash. [1] http://www.cs.rice.edu/~scrosby/hash/CrosbyWallach_UsenixSec2003.pdf [2] http://perldoc.perl.org/perlsec.html#Algorithmic-Complexity-Attacks [3] http://www.ocert.org/advisories/ocert-2011-003.html Task-number: QTBUG-23529 Change-Id: Ibee9cf6aa820af5d777fcde478647665c728052a Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * | QHash: remove optimization for QHash<int, T>Giuseppe D'Angelo2012-04-141-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHash employs an optimization for int/uints, squashing the hash value and the key value inside an union. This obviously works iff qHash(int k) = k. If the hash value gets salted, the hash table is corrupted. This patch removes that optimization by means of a #if 0, so if further research finds out that we want those 4 bytes back it's pretty simple to revert. Change-Id: If273f0bf2ff007f4f2f7c46d2aab364a3b455cf1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | QHash: fix key() testGiuseppe D'Angelo2012-04-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The key returned by QHash::key is an arbitrary one that maps to the given value. The test instead relied on it being a specific one. Change-Id: I090351797e8b52036d78160fd810518a11e8107d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | qHash: qHash(T*) two arguments supportGiuseppe D'Angelo2012-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1b78914fe9c6ee9251d68af1f2e95f1e3e0f1db5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | qHash: two arguments support for simple integer types (and QChar)Giuseppe D'Angelo2012-04-141-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24bed73422fb1d2e90cf3dd4e5375e249b3dcac4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| | * | Removed QXmlStreamReader::readElementText overloadThorbjørn Lindeijer2012-04-142-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version without argument was kept for binary compatibility when the configurable ReadElementTextBehaviour was introduced. It is now dropped in favour of using a default argument value. Change-Id: Ic08c41d5a5aad9f22df7fc37a2d53ffbc6df1fe9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | QSharedPointer: hash autotest fixGiuseppe D'Angelo2012-04-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hash autotest is wrong: it assumed that the iterator on the hash would reach the end after iterating on two elements with identical key. But three elements were added to that hash, and the third one can appear after the other two. That code path is left for the map test only. Change-Id: I51de7987e2b132b6caff7bb4bac6a57fb7fcb530 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | QSharedPointer: qHash two arguments supportGiuseppe D'Angelo2012-04-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I800de3fd9769e4829018360c25a8cf2ee2e2e08b Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | Add unit test for BackgroundRequestAttributeShane Kearns2012-04-131-1/+47
| | | | | | | | | | | | | | | | | | | | Change-Id: I807953cac3d23825461f9ae860badbd148835330 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
| | * | QLayoutItem - make controlTypes a virtual function.Thorbjørn Lund Martsum2012-04-135-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just implementing the ### Qt5 suggestion about making controlTypes a virtual function. Change-Id: Ic1db47fe488f089de965438e456e9b48e0b96f32 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | Style: Don't put an else after a return.Stephen Kelly2012-04-131-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I41d031d92489e5539f293c30a6257310f2a1c657 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * | Re-add the Qt 4 compatibility methods for QUrl encoded query itemsThiago Macieira2012-04-122-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I forgot to re-add those when I re-added the non-encoded (QString) forms. Change-Id: I9d635d40106273177df2c332f09d66415efc15a3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | Ensure proper handling of empty-but-present URL componentsThiago Macieira2012-04-122-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new QUrl is able to distinguish a URL component that is empty from one that is absent. The previous one already had that capability for the port, fragment and query, and the new one extends that to the username, password and path. The path did not need this handling because its delimiter from the authority it part of the path. For example, a URL with no username is one where it's set to QString() (null). A URL like "http://:kde@kde.org" is understood as an empty-but-present username, for which toString(RemovePassword) will return "http://@kde.org", keeping the empty-but-present username. Change-Id: I2d97a7656f3f1099e3cf400b199e68e4c480d924 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| | * | Remove QPaintBufferSignalProxy and QPaintBufferResource.Robin Burchell2012-04-122-89/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Nothing seems to use these... Change-Id: I58b3e5f8536e43b3076da0a86d9093a6e11b947a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | Remove 'using' of QPaintEngineEx methods from QRasterPaintEngine.Robin Burchell2012-04-121-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawEllipse() and the drawPolygon() overloads are all reimplemented, so there is no point having this here. Change-Id: I343cea0dd0fff2ed6a27be2a19459056e929f9d8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | Remove unused QIntRect.Robin Burchell2012-04-121-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't find any uses of this anywhere, in either Qt 4 or Qt 5. Change-Id: Ibf747b57b4afdd81e11631e87a80dcab5ac12f69 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | Address Qt 5 to-do comments related to QFileSystemModel.Jason McDonald2012-04-123-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - QFileSystemModel::rmdir() and QFileSystemModel::remove() changed to non-const -- they don't change the object, but they do change the file system, and the Qt way is to be non-const if having side-effects on external entities. - The comment on incompatibility between entryList and QFileInfo will not be fixed as doing so is likely to break existing code. - The comment on removing the internal resolvedSymLinks variable has been removed, as the variable is still used. Task-number: QTBUG-25088 Change-Id: I20456e4d116076403d9c4d4692ee05c178a1ed17 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | Address Qt 5 to-do comment for QColorDialog.Jason McDonald2012-04-123-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change customColor() to return QColor instead of QRgb. - change setCustomColor() and setStandardColor() to take a QColor instead of QRgb. - add missing standardColor() getter method. Task-number: QTBUG-25087 Change-Id: Ic6adb2031ef47f5e9b15fa3560a5322e6847c0bb Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * | make QStringList::sort() to take a Qt::CaseSensitivity paramKonstantin Ritt2012-04-123-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12892 Change-Id: I402e6fb12ff24ac26c5a8103bf81547946f9cc58 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>