summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.Jan-Arve Sæther2010-09-062-0/+8
* Compile fix WinCEJan-Arve Sæther2010-09-032-5/+14
* Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-0328-100/+282
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-09-012-5/+2
|\
| * Some small Solaris fixes.Pierre Rossi2010-08-312-5/+2
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-312-7/+70
|\
| * Fix QtScript Date <--> QDateTime (local time) conversionKent Hansen2010-08-312-7/+70
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-301-4/+9
|\ \ | |/
| * Fix Qt applications freezing until mouse/keyboard events occur.Bradley T. Hughes2010-08-301-4/+9
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-271-0/+2
|\
| * Recognize GL_ARB_shader_objects as indicating shadersRhys Weatherley2010-08-271-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-251-1/+1
|\ \ | |/
| * WGL_COLOR_BITS_ARB should not take the alpha bits into account.Trond Kjernåsen2010-08-251-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-241-0/+26
|\
| * QNAM HTTP: Prepare a compression auto test related to a future bugfixMarkus Goetz2010-08-231-0/+26
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-241-1/+1
|\ \
| * | 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-191-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-132-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
View Lorry Controller Status