summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-5/+11
|\ \ | |/
| * Fix tst_symbols auto testHarald Fernengel2010-11-041-5/+5
| * Export isLikelyToBeNfs only if we have an internal buildHarald Fernengel2010-11-021-4/+10
| * Fixed QFileInfo autotest to skip on NFS.Dominik Holland2010-11-021-4/+4
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-8/+13
|\ \ | |/
| * Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-1/+1
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
| |\ \ | | |/
| | * Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-131-3/+3
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-3/+3
| |\ \ | | |/
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-3/+3
| | |\
| | | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-031-3/+3
* | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-07-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-141-3/+3
| |\ \ \ | | |/ /
| * | | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-1/+1
| * | | Merge remote branch 'remotes/qt/4.6' into lighthousePaul Olav Tvete2010-02-101-19/+25
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-1/+1
| |\ \ \
| * \ \ \ Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-191-9/+15
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-301-4/+4
| |\ \ \ \ \
| * | | | | | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-071-1/+1
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Doc: QSettings::sync() imports changes made by other processes.Geir Vattekar2010-06-291-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | QSettings: Fix isWritable incorrectly returning true on linux.Christian Kamm2010-04-211-3/+1
|/ / / / /
* | | | | Fix QSettings default paths not being initialized when setPath() is calledDaniel Molkentin2010-01-271-19/+25
| |_|_|/ |/| | |
* | | | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |_|/ |/| |
* | | doc: Clarified when setDefaultFormat() is ignored by constructors.Martin Smith2009-10-151-9/+15
| |/ |/|
* | Update license headers again.Jason McDonald2009-09-091-4/+4
|/
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | doc: Fixed several qdoc errors.Martin Smith2009-08-281-8/+8
* | Doc: Noted a limitation in using slashes in settings section names.David Boddie2009-08-261-3/+3
* | Don't access usedHashFunc() if it's already been deleted.Thiago Macieira2009-08-211-1/+2
* | Merge commit 'qt/master'Jason Barron2009-08-181-2/+1
|\ \
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-2/+1
* | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | | Merge commit 'origin/master'Jason Barron2009-08-041-4/+8
|\ \ \
| * | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-4/+8
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-041-1/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Port of Qt to QNXHarald Fernengel2009-07-291-1/+1
| * | | Port of Qt to VxWorksRobert Griebl2009-07-291-0/+4
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-31/+6
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | src/corelib: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT s...miniak2009-07-011-31/+6
| |/
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | Make Qt exception safer.Robert Griebl2009-06-101-32/+36
|/