summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
| * | Enabling AdvancedPointerEvents for active windows causes a panicSami Merila2010-08-253-3/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian port of Qt, widgets that have attribute WA_AcceptTouchEvents, are tried to set as enabled for "advanced pointer events". These are multitouch events. However, the event enablation cannot be done after a window has been activated. Current implementation causes a crash in certain cases. For example, a treewidget that is inside a inactive tab page, causes a crash when tab page is selected. The crash is worked around, by not allowing a active window to enable advanced pointer events. This fixes http://bugreports.qt.nokia.com/browse/QTBUG-12779 Task-number: QTBUG-12779 Reviewed-by: mread
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-254-5/+66
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove enums from bitfield, since all compilers do not support them. Fixed compile error in runonphone. Use QImage 'convertInPlace' versions in QVGPixmapData load functions.
| * | Remove enums from bitfield, since all compilers do not support them.Janne Anttila2010-08-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, the softkey functionality is broken in Symbian emulator. What happens is that QAction::NegativeSoftkey enum turns out to negative value (-2) in QSoftKeyManagerPrivateS60::highestPrioritySoftkey comparision: if (action->softKeyRole() == role) In essence comparision gets executed as if (-2 == 2), which is false and negative softkey will never get displayed. There has been similar problems in XmlPatterns with MSVC in the past [1]. Apparently also Nokia X86 compiler does not support enums in bitfield, actually even C++ standard support is unclear - see [2]. In HW builds the problem does not occur since RVCT has extended support for enums in bitfield [3]. [1] http://qt.gitorious.org/qt/qt/blobs/4.7/src/xmlpatterns/acceltree/qacceltree_p.h#line212 [2] http://www.velocityreviews.com/forums/t317473-bitfield-and-enum-is-this-legal.html [3] http://www.keil.com/support/man/docs/armccref/armccref_ciaiabid.htm Reviewed-By: Thierry Bastian Reviewed-By: Janne Koskinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-243-1/+62
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed compile error in runonphone. Use QImage 'convertInPlace' versions in QVGPixmapData load functions.
| | * | Fixed compile error in runonphone.axis2010-08-241-0/+2
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Use QImage 'convertInPlace' versions in QVGPixmapData load functions.Jani Hautakangas2010-08-242-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QImage 'convertInPlace' uses less memory than 'convertToFormat' version. Task-number: QT-3710 Reviewed-by: Jason Barron
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2529-87/+635
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't circumvent onDestruction handlers when clearing expression in delegate cleanup Fix responseText to check the charset encoding field and also to not Re-insert and emit the correct NOTIFY signals following the removal Fix poor flicking behavior with slower flicks. Alignment of shadow for rich text is broken when using text styles typo Setting one dimension of the sourceSize should set the other dimension. Document calling QObject methods from QML in Extending QML in C++ docs.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2513-67/+148
| |\ \ \
| | * | | Fix responseText to check the charset encoding field and also to notBea Lam2010-08-254-21/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assume that the data is xml. The change also follows the w3c spec more closely (e.g. check the mime type field as well for encoding, for both responseText and responseXML). Task-number: QTBUG-13117
| | * | | Re-insert and emit the correct NOTIFY signals following the removalBea Lam2010-08-254-2/+8
| | | | | | | | | | | | | | | | | | | | of some NOTIFY parameters in d31e3bd3e27e9249df451b4b2a3a3a16e9160fa4
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-251-15/+7
| | |\ \ \
| | * | | | Alignment of shadow for rich text is broken when using text stylesYann Bodson2010-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13142
| | * | | | typoYann Bodson2010-08-251-1/+1
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2512-1/+463
| | |\ \ \ \
| | * | | | | Setting one dimension of the sourceSize should set the other dimension.Yann Bodson2010-08-253-40/+26
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit width and height should also be set to the sourceSize. Task-number: 13002
| * | | | | Don't circumvent onDestruction handlers when clearing expression in delegate ↵Martin Jones2010-08-253-4/+17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup We clear all expressions when removing a delegate in order to avoid spurious warnings. This also removed onDestruction handlers. Ensure the onDestruction handlers are called before the expressions are cleared. Task-number: QTBUG-12946 Reviewed-by: Aaron Kennedy
| * | | | Fix poor flicking behavior with slower flicks.Martin Jones2010-08-251-15/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a very low minimum velocity flick threshold, but upon deciding to flick we increased that velocity considerably. This resulted in a slow dragging movement generating a fast flick. Now we just have a higher minimum flick velocity threshold, and the correct velocity is used. Task-number: QTBUG-13078 Reviewed-by: Michael Brasser
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2518-46/+260
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-2418-46/+260
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Stabilize tst_qgraphicsscene QDeclarativeDebug: send a message when new object are added QDeclarativeEngineDebugServer: make it a singleton. Fix mispositioned text with QStaticText and OpenVG graphics system Use binarysort to find items. QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, and changed() signal connected Fix tst_Collections::QTBUG13079_collectionInsideCollection Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itself Fix assignment of a container included in the container itself
| * | | Stabilize tst_qgraphicssceneOlivier Goffart2010-08-241-2/+2
| | | |
| * | | QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-245-2/+27
| | | | | | | | | | | | | | | | Reviewed-by: Lasse Holmstedt
| * | | QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-243-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is already a singleton, just formalize it so it can be used in other files than qdeclarativeengine.cpp This also remove the global olbject QDeclarativeEngineDebugServer::m_engines Reviewed-by: Lasse Holmstedt
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-2412-35/+219
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix mispositioned text with QStaticText and OpenVG graphics system Use binarysort to find items. QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, and changed() signal connected Fix tst_Collections::QTBUG13079_collectionInsideCollection Fix assignment of a Q(Explicitly)SharedDataPointer included in the data itself Fix assignment of a container included in the container itself
generated by cgit v0.12 at 2025-08-26 08:19:53 (GMT)