summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
* Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2619-73/+807
|\
| * Revert "Fix a missing error-signal when a server is shut down while downloading"Peter Hartmann2010-11-262-18/+1
| * Add missing newline to configure.exe output.Jason McDonald2010-11-261-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2618-73/+824
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2518-73/+824
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2518-73/+824
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2418-73/+824
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-11-24182-5292/+8888
| | | | | |\
| | | | | | * Ensure that if this is does not have a valid filter when on XP or lessAndy Shaw2010-11-241-5/+7
| | | | | | * HTTP backend: fix build without Qt3 supportPeter Hartmann2010-11-231-1/+1
| | | | | | * QNetworkAccessManager: enable synchronous HTTP callsPeter Hartmann2010-11-2317-67/+799
| | | | | * | Fix a missing error-signal when a server is shut down while downloadingVille Pernu2010-11-242-1/+18
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-264-38/+45
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-262-31/+35
| |\ \ \ \ \ \
| | * | | | | | Fix type punning warnings from gccAaron Kennedy2010-11-262-31/+35
| * | | | | | | Repaint when text color changesAlan Alpert2010-11-261-5/+6
| |/ / / / / /
| * | | | | | Slightly improved tst_qmlvisual outputAlan Alpert2010-11-261-3/+4
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-268-114/+159
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-253-105/+125
|\ \ \ \ \ \ \
| * | | | | | | Only patch package content that is necessary for self-signingMiikka Heikkinen2010-11-253-105/+125
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-252-8/+25
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix possible artifacts under glyphs in texture glyph cacheEskil Abrahamsen Blomfeldt2010-11-251-1/+1
| * | | | | | | Fix QTBUG-13928 non flat mode for project files in VS2010.Martin Petersson2010-11-251-7/+24
| |/ / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-2553-704/+4568
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-242-0/+8
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-242-0/+8
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
| | | |/ / / / / /
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-251-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | fix inf loop bughawcroft2010-11-251-1/+1
| | | | | * | | | More detail when the process crashes in tst_qmlvisual.Alan Alpert2010-11-261-2/+3
| | | | |/ / / /
| | | | * | | | Update qml visual tests for mac.Yann Bodson2010-11-2547-699/+4512
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-2588-632/+1493
| | | | |\ \ \ \
| | | | | * | | | End painting of Rectangle pixmap before inserting it to pixmap cache to avoid...Joona Petrell2010-11-251-0/+8
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-251-1/+29
| | | | | |\ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2485-627/+1480
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed tst_qwidget::winIdChangeEventGareth Stockwell2010-11-241-12/+17
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2484-615/+1463
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Use parent class function to generate Makefile headers in SymbianMiikka Heikkinen2010-11-232-20/+3
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-231-1/+1
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix QPixmap::fromImage() in the OpenVG pixmap backend.Jason Barron2010-11-231-1/+1
| | * | | | | | | | | Fix spacesJanne Koskinen2010-11-232-2/+2
| | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-232-17/+35
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-231-0/+3
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7-s60' into 4.7-s60axis2010-11-230-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' into 4.7-s60axis2010-11-23121-5184/+7779
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | * | | | | | | | | | | Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |