summaryrefslogtreecommitdiffstats
path: root/src/concurrent
Commit message (Collapse)AuthorAgeFilesLines
* Remove references to QT_NO_STL from QtConcurrentThiago Macieira2012-04-071-30/+1
| | | | | | | | | Same as with QtCore, remove the #ifdef and #ifndef and select the side with STL. Change-Id: If1440080328c7c51afe35f5944a19dafc4761ee5 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove MSVC 6 workaround from QtConcurrent.Jason McDonald2012-03-122-42/+36
| | | | | | | MSVC 6 is not supported by Qt 5. Change-Id: I2aef026eb2ad6a68cd9bcddcf6578cb1a019b21c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove gcc 3.x-specific code from QtConcurrent and its tests.Jason McDonald2012-03-121-7/+0
| | | | | Change-Id: I4dd0ce50b70a47a0a00f4c7ec18077a1bcbe5705 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-041-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
| * QEvent (and subclasses): make ctors explicitMarc Mutz2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Do this regardless of whether the event subclass is public API or only used in examples. Examples are examples, used by others as templates or even copied verbatim, so they should also follow sound engineering rules. Anyway, there's only one in examples/... Change-Id: I586ff16407a956c9e89288fdd4377eed73f45c0f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-022-7/+7
|/ | | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QFutureWatcher: Make constructors explicitMarc Mutz2012-02-251-3/+3
| | | | | Change-Id: I363665725869993b10985004c1c6441ded435dbc Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Move QtConcurrent configuration to a single fileJoão Abecasis2012-02-1423-24/+111
| | | | | | | | | | | | | | This file lives in src/concurrent, alongside the rest of the library. Relevant configuration was moved out of qglobal.h, as it isn't relevant for other parties and thus isn't needed there. This introduces a global header that all QtConcurrent headers now include. This header includes qglobal.h and defines library-specific configuration for all to follow. Change-Id: If6f11e7bbc6139d29004eb1602bd579b75b637c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix src/concurrent/concurrent.proBradley T. Hughes2012-02-071-1/+3
| | | | | | | | | | | First, heed the warning from qmake and add load(qt_module) to the top of src/concurrent/concurrent.pro Second, qtconcurrentversion.h is in src/concurrent, not src/xml Change-Id: If4fc55ac2fe21c093023b377195ed82a54d8c963 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Complete split of QtConcurrent.Friedemann Kleint2012-02-066-10/+10
| | | | | | | | | | - Fix exports. - Fix tests. Acked-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I2df923ba74b468f5ee09b3a48ae3d09920751365 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Move QtConcurrent into its own moduleLars Knoll2012-02-0533-0/+9876
Task-number: QTBUG-20892 Change-Id: I614500aafb6428915509983608bbb0ade4e4f016 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>