aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared/qtlockedfile
Commit message (Collapse)AuthorAgeFilesLines
* Wholesale conversion to #pragma oncehjk2016-03-301-4/+1
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-194-68/+48
| | | | | | | * Update files in src/share* and src/tools Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-164-24/+24
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-094-28/+32
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Clean some trailing whitespaceOrgad Shaneh2014-05-071-1/+1
| | | | | Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-084-4/+4
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QtLockedFile: Delete lock file on unlockOrgad Shaneh2013-03-142-0/+2
| | | | | Change-Id: I78b887c961730e1d6cbc097f57f0a3ac97ec7c0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-314-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-294-4/+4
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Shared: Build with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-151-1/+1
|/ | | | | | | Windows fixes Change-Id: I90a02ec4f737f79542ad5ad0be3085813dfdfc8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Adjust license headershjk2012-10-054-84/+80
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-194-12/+4
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-152-2/+2
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-264-4/+4
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Compile with Qt 5/Linux.Friedemann Kleint2011-11-241-12/+4
| | | | | | | | (after running fixqt4headers.pl). Change-Id: Icb047cee2bd69acdb049beb9a769bfd2f4dcb841 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-034-8/+8
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-064-4/+4
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-134-56/+52
|
* Fix Krazy code scanning tool warnings (QString, loops, spelling).Friedemann Kleint2011-02-251-1/+1
|
* It's 2011 now.con2011-01-124-4/+4
| | | | Reviewed-by: hjk
* License headers.con2010-12-174-28/+44
|
* Long live the king!hjk2010-03-054-4/+4
|
* Merge remote branch 'origin/1.3'Oswald Buddenhagen2010-01-292-9/+9
|\ | | | | | | Trailing whitespace removal re-applied manually.
| * remove trailing whitespaceOswald Buddenhagen2010-01-292-9/+9
| | | | | | | | doing it in 1.3 as well to avoid possible later conflicts
* | Fix typosTobias Hunger2010-01-111-2/+2
|/ | | | Reviewed-by: thorbjorn
* long live the kinghjk2009-08-144-4/+4
|
* Update license headers and sales contact details.Jason McDonald2009-06-174-8/+8
| | | | Reviewed-by: Trust Me
* ifdef Q_?S_* cleanupOswald Buddenhagen2009-06-031-1/+1
| | | | | | - clear up some Q_OS_LINUX vs. Q_OS_UNIX - clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise) - use proper #if-#else cascades instead of free-standing #ifs
* Fixes: change file license headers to include LGPLhjk2009-02-254-84/+68
|
* Fixes: move all files in shared/* to src/shared/*hjk2009-01-267-0/+654