summaryrefslogtreecommitdiffstats
path: root/src/corelib/concurrent
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1337-37/+37
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Revert "QtConcurrent: Fix for leak in QFuture"Thiago Macieira2012-11-203-46/+5
| | | | | | | | | | This reverts commit 28b06b3ebae3d411c74f09fa7de52bc290c47dc3 That commit contains new symbols added in a patch release of Qt. That is not permitted. Change-Id: I1d36b50d4c26aa32072fd3f9c311a0e773527abd Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtConcurrent: Fix for leak in QFutureOrgad Shaneh2012-11-083-5/+46
| | | | | | | | | | | | | To avoid leaking when converting a QFuture<T> to a QFuture<void> we need to have a separate ref. counter for QFuture<T>. When the last QFuture<T> goes out of scope, we need to clean out the result data. backported from qt/qtbase commit 731ba8ed08f80644b403556638c7f6229e678ebe Original commit by Christian Strømme Task-number: QTBUG-27224 Change-Id: I0c6b525cf241b5c559a1bab4e0066cd4de556ea8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix for memory leak in ResultStoreOrgad Shaneh2012-11-081-1/+4
| | | | | | | | | | | | | | | In ResultStoreBase::addResults() it possible that the ResultItem we create is invalid (filter-mode enabled). Since an invalid ResultItem won't have any result data, we need to make sure that we don't allocate any data for it. Backported (with minor technical changes) from qt/qtbase commit 6039179373f7552c2a711b06a7d69b9ca9d2b175 Original commit by Christian Strømme Task-number: QTBUG-27224 Change-Id: I5c941363c211d0414d461e7b1b0274c80f3d69b9 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2937-888/+888
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0137-74/+74
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1137-37/+37
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTUREAndy Shaw2011-09-191-0/+3
| | | | | | | | | | This solves a build issue on Solaris as the symbols were missing so they are now added in the expected way after discussion with the Nokia developer who approved the patch originally for winscw. Task-number: QTBUG-21523 Merge-request: 1389 Reviewed-by: ossi
* Wrap calls to Sequence::push_backJoão Abecasis2011-09-023-15/+32
| | | | | | | | | | | | | | | | | In C++11 push_back is overloaded to support rvalue-references, void std::vector<T>::push_back(const T &); void std::vector<T>::push_back(T &&); so attempting to get the address for push_back is ambiguous. Instead of hardcoding the function signature, the better and more general solution is to allow the compiler to do the required overload resolution itself, also allowing for implicit conversions to take place. Task-number: QTBUG-18996 Done-with: Liang Qi Reviewed-by: Olivier Goffart
* Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-2437-629/+629
|\
| * Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1337-629/+629
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Support of lambdas in QtConcurrent::runOlivier Goffart2011-05-194-81/+124
|/ | | | Reviewed-by: Joao
* Disable QtConcurrent for Symbian winscw builds.Laszlo Agocs2011-05-122-5/+22
| | | | | | | | | | | | | | | | | While QtConcurrent is nowadays usable with RVCT and GCCE compilers, the compiler used for the winscw target has problems with the templates still. To enable building 4.8 on winscw, the patch defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for this target. However this causes further complications in the Q_OBJECT classes of QtConcurrent because moc will be run without having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian app and for other Symbian targets they must not be defined, which makes differentiation in qglobal.h impossible for the moc run) and having a moc file generated for a class that will be ifdef'ed out during compilation causes build breaks. Therefore additional dummy stubs are provided in QFutureWatcherBase. Reviewed-by: Liang Qi
* Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.Liang Qi2011-05-021-18/+0
| | | | Because Qt doesn't support that feature before.
* Compile with msvcOlivier Goffart2011-05-021-4/+16
| | | | msvc tries to instenties the return type of overloads that are not chosen by overload resolution
* compile with windowsOlivier Goffart2011-05-021-4/+4
| | | | MSVC doesn't pick up the right template partial specialisation.
* get rid of the DisableIfSame hackOlivier Goffart2011-05-022-16/+4
| | | | By changing the order of the parametters, in a way it is unlikely to clash
* Rewrite the interfaces of QtConcurrent.Liang Qi2011-05-023-1057/+270
| | | | | | | | | At least make RVCT 2.2 work. Task-number: QTBUG-5182 Task-number: QTBUG-9070 Reviewed-by: Olivier Goffart Reviewed-by: joao
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-071-1/+1
|\ | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | * Report that an update is needed if no update was doneThiago Macieira2011-03-281-1/+1
| | |
* | | QtConcurrent: throw exception from destructorOlivier Goffart2011-03-281-6/+1
|/ / | | | | | | | | Task-number: QTBUG-18149 Reviewed-by: Morten Sorvig
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-232-7/+7
|\| | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * Use QElapsedTimer in QFutureInterface.Thiago Macieira2011-02-162-7/+7
| | | | | | | | | | | | | | | | QElapsedTimer can also keep its on vlaid/invalid state, so we don't need to keep an additional boolean. Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=227660 Reviewed-by: Morten Sørvig
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1737-37/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1137-37/+37
| | | | | | | | Reviewed-by: Trust Me
* | Remove qDebug.Morten Johan Sørvig2010-11-111-1/+0
| |
* | Support exception handling in QtConcurrent::run()Morten Johan Sørvig2010-11-111-2/+24
| | | | | | | | Use QFutureInterface::reportException() in the same way that we do in QtConcurrent::map().
* | QThreadPool: name pooled threadsArvid Ephraim Picciani2010-09-171-0/+1
| | | | | | | | | | | | Task-Number: QTBUG-13702 Reviewed-by: Andy Shaw Reviewed-by: ossi
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-08-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (168 commits) Remove enums from bitfield, since all compilers do not support them. Don't circumvent onDestruction handlers when clearing expression in delegate cleanup Fix responseText to check the charset encoding field and also to not Re-insert and emit the correct NOTIFY signals following the removal Fix poor flicking behavior with slower flicks. Alignment of shadow for rich text is broken when using text styles typo Setting one dimension of the sourceSize should set the other dimension. Document calling QObject methods from QML in Extending QML in C++ docs. Stabilize tst_qgraphicsscene QDeclarativeDebug: send a message when new object are added QDeclarativeEngineDebugServer: make it a singleton. Fixed compile error in runonphone. Fix mispositioned text with QStaticText and OpenVG graphics system Use binarysort to find items. Use QImage 'convertInPlace' versions in QVGPixmapData load functions. QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, and changed() signal connected Added an install target to runonphone. Fix tst_Collections::QTBUG13079_collectionInsideCollection Fix few declarative code issues discovered by static code analysis ...
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| | * Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::split has overload, and if you want to take the address of a function with overload, you need to cast it. If we really wanted to use QString::split, we would have to do QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive); So use QByteArray::split as an example instead Task-number: QTBUG-12897 Reviewed-by: David Boddie
* | | QFutureWatcher: display a warning when connecting after calling setFuture()Olivier Goffart2010-08-231-0/+9
|/ / | | | | | | Reviewed-by: brad
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-134-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-093-3/+3
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
| * Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-291-1/+1
| | | | | | | | QTBUG-11938 and QTBUG-10801
* | It is no longer necessary to check for QT_NO_MEMBER_TEMPLATESminiak2010-08-031-1/+1
| | | | | | | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATIONminiak2010-08-031-4/+1
| | | | | | | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-031-6/+0
| | | | | | | | | | | | | | The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/page/FrameView.h src/3rdparty/webkit/WebCore/platform/ScrollView.cpp src/3rdparty/webkit/WebCore/platform/ScrollView.h src/corelib/plugin/quuid.cpp src/gui/dialogs/qfontdialog.cpp src/multimedia/audio/qaudiodevicefactory.cpp src/opengl/qgl.cpp src/openvg/qpaintengine_vg.cpp tests/auto/qxmlquery/tst_qxmlquery.cpp
| | * typos fixedJoerg Bornemann2010-07-071-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Added QThreadPool::waitForDone(int msecs)Thomas Sondergaard2010-05-263-4/+33
|/ / | | | | | | | | | | | | Merge-request: 641 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: Morten Sorvig Task-number: QTBUG-2695
* | Revert "adds a timeout option to QThreadPool::waitForDone();"Pierre Rossi2010-04-013-15/+7
| | | | | | | | | | This reverts commit a0df2ac07c75882618b40657e1485dda3204880e as it induced a BC breakage.
* | adds a timeout option to QThreadPool::waitForDone();Pierre Rossi2010-03-313-7/+15
| | | | | | | | | | Task-number: QTBUG-2695 Reviewed-by: Benjamin Poulain
* | doc: Fixed several qdoc errors.Martin Smith2010-03-091-1/+1
|/
* More pedantry.Trond Kjernåsen2010-02-241-2/+2
| | | | Reviewed-by: Kim
* Fix grammar.Trond Kjernåsen2010-02-241-2/+3
| | | | Reviewed-by: Kim
* Doc: QFutureWatcher: specify that calls to setFuture should happen after the ↵Olivier Goffart2010-02-241-0/+6
| | | | | | connections Reviewed-by: Morten Sorvig
* Change all ptrdiff_t to qptrdiff.Thiago Macieira2010-02-171-1/+1
| | | | Reviewed-By: Bradley T. Hughes
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 20:50:16 +0000