summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'earth-staging/master'Olivier Goffart2011-05-182-39/+56
|\
| * Symbian socket: Implement systemProxyForQuery for service networksShane Kearns2011-05-182-39/+56
* | tst_q3dns: update test to follow RFC-5952.Martin Petersson2011-05-181-1/+1
|/
* Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-16148-190/+9725
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-139-1/+1055
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-...Kai Koehne2011-05-129-1/+1055
| | |\
| | | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-129-1/+1055
| | | |\
| | | | * Allow 'typeinfo <file>' lines in qmldir.Christian Kamm2011-05-123-0/+156
| | | | * qmlplugindump: Use command line options with a single dash.Christian Kamm2011-05-121-7/+12
| | | | * qmlplugindump: Allow dumping by path without URI.Christian Kamm2011-05-121-11/+29
| | | | * Move qmldump from Qt Creator to Qt.Christian Kamm2011-05-126-1/+876
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-133-1/+26
| |\ \ \ \
| | * | | | X11: Keep the menubar inside the widgetbox window in toplevel modeMichał Zając2011-05-131-0/+11
| | * | | | Retain ABI and API compatibility when Qt is built with EGL.Michał Zając2011-05-132-1/+15
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-05-1317-49/+140
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-121-0/+14
| | |\ \ \ \ \
| | | * | | | | Fix QtOpenGL def file for armv5.Laszlo Agocs2011-05-121-0/+14
| | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-12345-3577/+9102
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Disable QtConcurrent for Symbian winscw builds.Laszlo Agocs2011-05-125-5/+37
| | | * | | | | Fix loss of focus and activation when hiding a child widgetMiikka Heikkinen2011-05-122-11/+21
| | | * | | | | Symbian build failure for Armv5Sami Merila2011-05-124-12/+12
| | | * | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-1131-121/+1113
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Fix softkeys in case a dialog with softkeys that have icons is closed.Miikka Heikkinen2011-05-101-10/+30
| | | * | | | | Update softkeys after orientation switch.Miikka Heikkinen2011-05-101-0/+4
| | | * | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-1010-30/+273
| | | |\ \ \ \ \
| | | * | | | | | Provide internal API to avoid automatic translation of input widgetSami Merila2011-05-095-2/+13
| | | * | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-09298-3396/+7609
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-041-7/+9
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-05-041-7/+9
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-1292-68/+8086
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | * | | | | | | | QmlDebug: Fix QmlOstPlugin compilation failureTom Sutcliffe2011-05-114-2/+51
| | * | | | | | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-10916-17352/+69948
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Enable performance monitoring at application startup.Kai Koehne2011-05-1011-10/+132
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-091-0/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Augment documentationAlan Alpert2011-05-091-0/+2
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-062-6/+18
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | QmlDebugger: removing slots in Live PreviewChristiaan Janssen2011-05-061-1/+4
| | | * | | | | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-062-5/+14
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-0578-50/+7883
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fixed license headerThorbjørn Lindeijer2011-05-051-8/+16
| | | * | | | | | Fixed compile on WindowsThorbjørn Lindeijer2011-05-041-1/+1
| | | * | | | | | Added forgotten file qdeclarativeobserverinterface_p.hThorbjørn Lindeijer2011-05-041-0/+69
| | | * | | | | | Removed some trailing whitespaceThorbjørn Lindeijer2011-05-042-22/+22
| | | * | | | | | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-045-4/+24
| | | * | | | | | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-0471-7/+7740
| | | * | | | | | QDeclarativeDebugServer: Send hello answer before any service messagesThorbjørn Lindeijer2011-05-021-8/+11
| | | * | | | | | Removed some superfluous semicolonsThorbjørn Lindeijer2011-05-021-9/+9
| * | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-05-1119-20/+377
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix GLES2 include path for applications when not using the dash shellPaul Olav Tvete2011-05-111-1/+1