summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-11-172-11/+37
|\
| * DeclarativeDebugServer: Instantiate QPluginLoader on heapAurindam Jana2011-11-171-7/+8
| * qmlplugindump: Fix dumping empty names for generated QMetaObjects.Christian Kamm2011-11-161-4/+29
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-11-144-17/+127
|\ \ | |/
| * Properly protect access to pixmap reader thread with mutexChris Adams2011-11-143-16/+126
| * qmlplugindump: Add flush to fix output redirection on windows.Christian Kamm2011-11-031-1/+1
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-09-19760-7050/+16118
|\ \ | |/
| * Debugger: Fix autotest breakageKai Koehne2011-09-191-1/+0
| * Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*Kai Koehne2011-09-166-10/+7
| * Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-1610-61/+58
| * Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-155-12/+71
| * Merge remote-tracking branch 'qt/4.8' into master-qmlKai Koehne2011-09-15744-6968/+15984
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-1018-223/+194
| | |\
| | | * Merge remote-tracking branch 'qt-fire-review/master'aavit2011-09-10227-1629/+4374
| | | |\
| | | | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-09-10224-1623/+4364
| | | | |\
| | | | | * Disable autotest broken by the change to QCache in 7ab0bedaavit2011-09-101-1/+3
| | | | | * Generate glyphs in un-transformed coordinate system.Samuel Rødal2011-09-091-3/+4
| | | | | * Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFTAleksandar Stojiljkovic2011-09-091-2/+6
| | | | | * Reset trailingSpaces in relayoutJiang Jiang2011-09-091-0/+1
| | | | | * Prevent QPixmapCache potentially growing indefinitely.Samuel Rødal2011-09-092-2/+26
| | | | | * Allocate 16-byte aligned memory independent of platform for raster pool.Samuel Rødal2011-09-091-37/+17
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-09-083-5/+6
| | | | | |\
| | | | | | * Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-083-5/+6
| | | | | * | 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