summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-08216-1573/+4301
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-0810-172/+131
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Fix RTL layout for fonts when non-printable character has an advanceJohn Tapsell2011-09-082-2/+4
| | | * | | | | | | | | | | Fix regression in tst_qrawfontEskil Abrahamsen Blomfeldt2011-09-081-1/+3
| | | * | | | | | | | | | | Make it compile on macaavit2011-09-071-3/+3
| * | | | | | | | | | | | | Merge remote-tracking branch 'qt-fire-team/master'aavit2011-09-068-168/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fixed compiling error in qvfb.luohua2011-09-022-2/+9
| | * | | | | | | | | | | micro optimizationsKonstantin Ritt2011-09-024-109/+48
| | * | | | | | | | | | | fix "comparison between signed and unsigned" warningsKonstantin Ritt2011-09-021-7/+5
| | * | | | | | | | | | | on windows, don't resolve the gdi32's symbols for each QRawFont instanceKonstantin Ritt2011-09-022-37/+26
| | * | | | | | | | | | | fix typo in the docsKonstantin Ritt2011-09-021-1/+1
| | * | | | | | | | | | | QRawFont: add missed operator !=Konstantin Ritt2011-09-022-0/+9
| | * | | | | | | | | | | optimize QGlyphRun's operator == a bitKonstantin Ritt2011-09-021-7/+11
| | * | | | | | | | | | | QGlyphRun: make operator != inlinedKonstantin Ritt2011-09-022-5/+5
| | * | | | | | | | | | | QGlyphRun: don't detach if the decoration wasn't actually changedKonstantin Ritt2011-09-021-0/+9
| * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-30562-5712/+11729
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-08-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | QPA event loop: Set a timeout != 0 if there are no timers.Eike Ziller2011-08-291-1/+1
* | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-0717-111/+73
* | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-085-2/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-075-2/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-075-2/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | | * | | | | | | | | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-062-1/+47
| | | * | | | | | | | | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | * | | | | | | | | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0712-7/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | fix build for desktopKonstantin Ritt2011-09-072-2/+13
| * | | | | | | | | | | | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-0610-5/+38