summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | * | | | | | | | | | | | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-093-5/+12
| | | | | | | | | | | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-081-0/+5
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / | | | | | | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | | | | | | | | | update the proxy info before session is opened in QNAM by Aapo MakelaKranthi Kuntala2011-09-081-0/+5
| | | | | | | | | | | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-09-072-6/+7
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / | | | | | | | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | | | | | | * | | | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-09-0541-145/+727
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / | | | | | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | | | | | * | | | | | | | | | | Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
| | | | | | | | | | | | | | | * | | | | | | | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-0240-141/+723
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-21413-55011/+43266
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-08-17411-55008/+43262
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-07-211-1/+1
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | | | | | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-07-071-1/+1
| | | | | | | | | | | | | | | * | | | | | | | | | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| | | | | | | | | | | | | | | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-075-21/+48
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / / | | | | | | | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | | | | | | | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+35
| | | | | | | | | | | | | | * | | | | | | | | | | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-09-061-11/+12
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Fix typo in header guard.Jason McDonald2011-09-061-1/+1
| | | | | | | | | | | | | | * | | | | | | | | | | | | | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| | | | | | | | | | | | | | * | | | | | | | | | | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| | | | | | | | | | | | | | * | | | | | | | | | | | | | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
| | | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / | | | | | | | | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | | | | | * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-154-95/+13
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / / / / / / / / / /
| | | | | | | | | | | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-15649-5775/+13389
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | | | | | | | | | | | | Update changes file.Christian Kandeler2011-09-141-1/+2
| | | | | | | | | | | | * | | | | | | | | | | | | | | wtf? .pro.user files? congrats to overriding the hook!Oswald Buddenhagen2011-09-131-83/+0
| | | | | | | | | | | | * | | | | | | | | | | | | | | Fix QNetworkReply::errorString returning an untranslated stringGiuseppe D'Angelo2011-09-121-10/+10
| | | | | | | | | | | | * | | | | | | | | | | | | | | runonphone: Add a missing argument for QString::argMartin Storsjo2011-09-121-1/+1
| | | | | | | | | | | * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-1527-50/+339
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | | | | | | | | | | | | Updated WebKit to 64cce10 (qtwebkit-rc1, week36)Ademar de Souza Reis Jr2011-09-1327-50/+339
| | | | | | | | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-153-4/+12
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | | | | | | | * | | | | | | | | | | | | | | | Fix crash in compiled bindingsAaron Kennedy2011-09-143-4/+12
| | | | | | | | | | * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-1018-223/+194
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-101-56/+3
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / | | | | | | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | | | | | | find qt.conf more reliablyOswald Buddenhagen2011-09-091-56/+3
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-09-1015-41/+190
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Merge fixes for QDir::operator==Shane Kearns2011-09-072-3/+34
| | | | | | | | | | * | | | | | | | | | | | | | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+34
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Restore Qt4.7 behaviour of QFileInfo::absolute(File)PathShane Kearns2011-09-054-10/+12
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Fix compile error on MSVC2008Shane Kearns2011-09-051-1/+1
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Fix comparison of absolute, unclean paths in QDirShane Kearns2011-09-025-1/+78
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Wrap calls to Sequence::push_backJoão Abecasis2011-09-024-19/+32
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-09-091-2/+2
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | | | | | | | | qmake vcxproj generator: fix XML conversion for build eventsJoerg Bornemann2011-09-081-2/+2
| | | | | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-092-5/+43
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Fix double click and drag not extending word selection.Andrew den Exter2011-09-082-5/+43
| | | | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0822-146/+115
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | _ / / / / / / / / / / / / / / / | | | | | | | | | | | | / / / / / / / / / / / / / / /
| | | | | | | | | * | | | | | | | | | | | | | | | | | Split CFLAGS from pkg-config properlyJan Arne Petersen2011-09-071-2/+15
| | | | | | | | | * | | | | | | | | | | | | | | | | | Ensure that the proxystyle is used over the style's own functionsAndy Shaw2011-09-071-11/+7
| | | | | | | | | * | | | | | | | | | | | | | | | | | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| | | | | | | | | * | | | | | | | | | | | | | | | | | Perl check for windows configure.Markku Heikkila2011-09-071-11/+15
| | | | | | | | | * | | | | | | | | | | | | | | | | | QSettings: don't assume XDG_CONFIG_HOME is latin1-encodedKonstantin Ritt2011-09-071-2/+2
| | | | | | | | | * | | | | | | | | | | | | | | | | | QSettings: use the common appdata dir when bootstrapping qmake on winKonstantin Ritt2011-09-071-8/+2