summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2010-08-2614-29/+85
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-262-1/+15
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for DEPLOYMENT.pkg_build_version fix for memory leak in QSysInfo::s60Version()
| | * Added support for DEPLOYMENT.pkg_build_versionMiikka Heikkinen2010-08-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEPLOYMENT.pkg_build_version can be used to pad the patch version number in Symbian pkg files to allow hot-fix deployments to be done between patch releases. DEPLOYMENT.pkg_build_version accepts only values 0 - 99, as pkg patch version number has limits how large numbers it can accept. The specified number is prefixed with zero if it is single digit and then appended to patch version number. Task-number: QTBUG-13147 Reviewed-by: Janne Koskinen
| | * fix for memory leak in QSysInfo::s60Version()mread2010-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A CDir was not deleted on several return paths in QSysInfo::s60Version(). This fix uses a QScopedPointer to clean up the CDir no matter what return path is taken. Reviewed-by: Simon Hausmann
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-08-2612-28/+70
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: WGL_COLOR_BITS_ARB should not take the alpha bits into account. Fix the broken unicode detection of ODBC driver. QNAM HTTP: Prepare a compression auto test related to a future bugfix fix Norwegian Breakfast Network warnings in configure fix shadow build of configure.exe fix epic fail from 4ba6646 qmake: fix assertion on Windows when DESTDIR is empty in static libs Fix OpenGLVersionFlags on OpenGL 4.0 systems Update changes-4.6.4 with recent shader program changes Don't define highp/mediump/lowp if desktop GL has them QNAM HTTP: Fix crash related to aborted uploads QAudioOutput(ALSA); Fix check for available devices.
| | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-2612-28/+70
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-251-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: WGL_COLOR_BITS_ARB should not take the alpha bits into account.
| | | * | WGL_COLOR_BITS_ARB should not take the alpha bits into account.Trond Kjernåsen2010-08-251-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WGL_COLOR_BITS_ARB attribute is only supposed to specify the number of color bits in each buffer, *excluding* the alpha bits. Task-number: QTBUG-13141 Reviewed-by: Samuel
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-241-0/+26
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Prepare a compression auto test related to a future bugfix
| | | * | QNAM HTTP: Prepare a compression auto test related to a future bugfixMarkus Goetz2010-08-231-0/+26
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12908
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-241-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the broken unicode detection of ODBC driver.
| | | * | | Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-241-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unicode flag is entirely overrided by mistake. Task-number:QTBUG-13109 Reviewed-by:Michael Goddard
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-204-18/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix Norwegian Breakfast Network warnings in configure fix shadow build of configure.exe
| | | * | fix Norwegian Breakfast Network warnings in configureJoerg Bornemann2010-08-203-17/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | | * | fix shadow build of configure.exeJoerg Bornemann2010-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-181-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix epic fail from 4ba6646
| | | * | fix epic fail from 4ba6646Joerg Bornemann2010-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-171-3/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: fix assertion on Windows when DESTDIR is empty in static libs
| | | * | qmake: fix assertion on Windows when DESTDIR is empty in static libsJoerg Bornemann2010-08-171-3/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically replacing project->values("foo").first() with project->first("foo") which does a null check. Task-number: QTBUG-12851 Reviewed-by: ossi
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-162-2/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix OpenGLVersionFlags on OpenGL 4.0 systems
| | | * | Fix OpenGLVersionFlags on OpenGL 4.0 systemsRhys Weatherley2010-08-162-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the OpenGL version was 4.0 or higher, the flags for 1.1, 1.5, 2.0, and so on were not being set. This lead to the flags indicating that older OpenGL versions were not supported when they clearly were. Back port parts of 28659c21d12a267b10e5b441bf4c776e04d69bdc from Qt 4.7 to fix this in Qt 4.6. Task-number: QTBUG-12554 Reviewed-by: Sarah Smith
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-131-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update changes-4.6.4 with recent shader program changes
| | | * | 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 ↵Qt Continuous Integration System2010-08-134-5/+16
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't define highp/mediump/lowp if desktop GL has them
| | | * | 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 ↵Qt Continuous Integration System2010-08-122-1/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Fix crash related to aborted uploads
| | | * | | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| | |/ / / | | | | | | | | | | | | | | | Task-number: QTBUG-12285
| | | * | Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-134-5/+16
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL 4.0 systems now have compatibility with ES2, including support for the precision qualifiers. If the GL_ARB_ES2_compatibility extension is present, then we don't define highp/mediump/lowp to the empty string. Task-number: QTBUG-12862 Reviewed-by: Sarah Smith
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-121-14/+17
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices.
| | | * | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2644-63/+213
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Handle layoutChanged() properly in QML views. Fix ListView and GridView tests following off-by-one fixes. Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7ac Fix off-by-one at end when views scroll to keep currentItem visible. Make declarative examples a bit more qt-like. Add quit buttons to declarative demos ListView.view and GridView.view properties should not be writable. Avoid Flickable view jumping when drag threashold is exceeded. Fix ListView.view attached property with VisualItemModel Remove dead code. Add test for VisualItemModel layoutChanged() handling Remove unused code. Handle QAbstractItemModel layoutChanged() signal
| * | | Handle layoutChanged() properly in QML views.Martin Jones2010-08-263-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Update all visible items when layoutChanged() is emitted. Task-number: QTBUG-13146
| * | | Fix ListView and GridView tests following off-by-one fixes.Martin Jones2010-08-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Our tests were verifying incorrect positions... Task-number: QTBUG-12822
| * | | Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7acMartin Jones2010-08-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | QAbstractItemModel calls that for all sorts of reasons. Task-number: QTBUG-13146
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2629-30/+102
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
| | |\ \ \
| | | * | | Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13048 Reviewed-by: Martin Jones
| | * | | | Make declarative examples a bit more qt-like.Yann Bodson2010-08-2619-10/+10
| | |/ / /
| * | | | Fix off-by-one at end when views scroll to keep currentItem visible.Martin Jones2010-08-262-13/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | endPosition() is the last pixel of the item, i.e. width-1, so must add one to ensure the entire item is visible. Task-number: QTBUG-12822
| * | | ListView.view and GridView.view properties should not be writable.Martin Jones2010-08-262-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-13166
| * | | Avoid Flickable view jumping when drag threashold is exceeded.Martin Jones2010-08-262-2/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-13176
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-261-2/+0
| |\ \ \
| | * | | Remove dead code.Michael Brasser2010-08-261-2/+0
| | | | |
| * | | | Fix ListView.view attached property with VisualItemModelMartin Jones2010-08-266-9/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assumed that the attached object was created at the same time as the item. Task-number: QTBUG-13166 Reviewed-by: Aaron Kennedy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-3/+0
| |\ \ \
| | * | | Remove unused code.Michael Brasser2010-08-251-3/+0
| | | | |
| * | | | Add test for VisualItemModel layoutChanged() handlingMartin Jones2010-08-252-0/+50
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13146
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-254-5/+66
| |\ \ \ \ | | |/ / /
| * | | | Handle QAbstractItemModel layoutChanged() signalMartin Jones2010-08-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treated identically to reset. Task-number: QTBUG-13146
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-253-3/+13
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabling AdvancedPointerEvents for active windows causes a panic
generated by cgit v0.12 at 2025-01-09 19:30:39 (GMT)