summaryrefslogtreecommitdiffstats
path: root/src/qtconcurrent
Commit message (Collapse)AuthorAgeFilesLines
* Updated license headers and license testsAntti Kokko2016-06-104-68/+48
| | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update copyright headersAntti Kokko2015-02-144-32/+32
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-09-254-76/+44
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* qtconcurrent/generaterun: adapt to earlier changes in qtconcurrentrun.hMarc Mutz2014-08-061-25/+22
| | | | | | | | Except for the license header and the new auto return functions, the qtconcurrentrun.h header is now reproduced faithfully again. Change-Id: Ib3b1ec10e75ddfb8e4bd8f7d765ce9d2fc1fc4f9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* qtconcurrent/generaterun: adapt to run(QThreadPool *pool,...)Marc Mutz2014-08-061-21/+27
| | | | | | | The output is still very different from the checked-in file in QtCore. Change-Id: I02f7489867b891c7867deebd33a39547c16923e4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* qtconcurrent/generaterun: allow to pass the output dir as an argumentMarc Mutz2014-07-311-3/+15
| | | | | | | The hard-coded paths don't exist anymore. Change-Id: Ie993f0a08d9dc2d89fa08911c18a09706af2fa24 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* qtconcurrent/generaterun: compileMarc Mutz2014-07-311-1/+0
| | | | | Change-Id: I9f3e08d93effaf2f6b6d07136d0867f13c6cd95d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* whitespace fixesOswald Buddenhagen2014-01-203-31/+31
| | | | | | | | remove trailing spaces & expand tabs Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Changed contact detailsTeemu Kaukoranta2013-05-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | Contact details from qt-project.org to qt-project.org/legal Used the following command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{ s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/ \1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I }}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*) (.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.* |.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.* |.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.* |.*http:\/\/www\.qt-project\.org\/.*)/ \1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}') Change-Id: I87a501e4fab3b47797190ea7bbf6257a33fe3d7f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-104-6/+6
| | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-1/+0
| | | | | | | | qmake now adds CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I705c8e11b8787bb4f848f4aad19d860f88b04577 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update information from Nokia to Digia and Qt ProjectSergio Ahumada2012-11-282-2/+2
| | | | | | | | Task-number: QTBUG-28156 Change-Id: I2d813a0f4fa266af004714f04b16501f5751c881 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-254-96/+96
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-212-12/+0
| | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I300d4be1928e5a7dab0fdf1c5a56992e9960b1a4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-304-4/+4
| | | | | | | | | | | 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: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-234-6/+6
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-064-6/+6
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-244-68/+68
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Initial import from the monolithic Qt.Qt by Nokia2011-04-277-0/+868
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 10:34:15 +0000