summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-241-1/+1
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-204-18/+17
|\
| * fix Norwegian Breakfast Network warnings in configureJoerg Bornemann2010-08-203-17/+16
| * fix shadow build of configure.exeJoerg Bornemann2010-08-201-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-181-1/+1
|\ \ | |/
| * fix epic fail from 4ba6646Joerg Bornemann2010-08-181-1/+1
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-171-3/+6
|\ \ | |/
| * qmake: fix assertion on Windows when DESTDIR is empty in static libsJoerg Bornemann2010-08-171-3/+6
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-162-2/+11
|\
| * Fix OpenGLVersionFlags on OpenGL 4.0 systemsRhys Weatherley2010-08-162-2/+11
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-131-0/+2
|\ \ | |/
| * Update changes-4.6.4 with recent shader program changesRhys Weatherley2010-08-131-0/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-134-5/+16
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-08-132-1/+5
| |\ | |/ |/|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-122-1/+5
|\ \
| * | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
|/ /
| * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-134-5/+16
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-121-14/+17
|\
| * QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-113-4/+70
|\
| * QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-102-0/+7
| * fix build for -no-qt3supportPeter Hartmann2010-08-101-2/+2
| * Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-08-103-4/+63
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-101-1/+1
|\ \ | |/
| * Doc: typo fixed in qlibraryinfo.cppJoerg Bornemann2010-08-091-1/+1
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-066-17/+398
|\
| * Fixes for combining multiple Qt::ImhXXXOnly with S60 FEPShane Kearns2010-08-061-22/+30
| * fix compile errorShane Kearns2010-08-061-1/+1
| * Test code for input method hintsShane Kearns2010-08-065-0/+366
| * Make input methods work correctly with Symbian^3 FEP in numeric modeShane Kearns2010-08-061-6/+13
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-055-3/+47
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-08-055-3/+47
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-041-3/+7
|\
| * Improving text coordinate rounding in the OpenVG paint engineAlessandro Portale2010-08-041-3/+7
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-031-3/+13
|\ \ | |/
| * Add QDir::homePath() for the log file in QTestFileLogger in testlib on Symbia...Liang Qi2010-08-031-3/+13
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-23/+126
|\ \ | |/
| * Fixed test regression on MacGareth Stockwell2010-08-031-0/+5
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-26/+124
| |\ |/ /
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-26/+124
| |\
| | * Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | * Enabled tst_mediaobject::testPlayFromResource on SymbianGareth Stockwell2010-08-021-18/+2
| | * Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-023-9/+9
| | * Updated tst_mediaobject resource playback test casesGareth Stockwell2010-08-021-6/+17
| | * Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-031-0/+4
|\ \ \ | |/ / |/| |
| * | Don't resolve GLSL extensions if no shadersRhys Weatherley2010-08-031-0/+4
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-031-1/+1
|\ \ \ | |/ /
| * | setUniformValue(QSize) was setting (w,w) not (w,h)Rhys Weatherley2010-08-031-1/+1
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-301-3/+13
|\ \ | |/