summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Wrap EGL image function pointers and move into QEgl namespaceTom Cooksey2010-04-154-32/+49
| | | | | | | QtGui exporting a symbol called eglCreateImageKHR seems a pretty silly idea. Much better to have them in the QEgl namespace. Reviewed-By: Iain
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1515-87/+180
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation of ShivaVG, which does not have EGL. Move nativePaintingActive flag to GL2 engine's private More adjustments to QTBUG-6800 Adjustments to QTBUG-6800 patch. QTBUG-6800 patch included, but only for OpenGL 2.0 Support building with desktop OpenGL managed via EGL Print more information when debugging X11 Visual selection Fix gcc compile warning in qstatictext.cpp Avoid taking sqrt of negative number in FT font engine
| * Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-151-0/+2
| | | | | | | | | | Task-number: QTBUG-9809 Reviewed-by: Sarah Smith
| * Move nativePaintingActive flag to GL2 engine's privateTom Cooksey2010-04-142-9/+10
| | | | | | | | Reviewed-By: Samuel
| * More adjustments to QTBUG-6800Carolina Gomes2010-04-143-13/+11
| | | | | | | | | | Merge-request: 2344 Reviewed-by: Tom Cooksey
| * Adjustments to QTBUG-6800 patch.Carolina Gomes2010-04-141-8/+6
| | | | | | | | | | Merge-request: 2344 Reviewed-by: Tom Cooksey
| * QTBUG-6800 patch included, but only for OpenGL 2.0Carolina Gomes2010-04-143-1/+39
| | | | | | | | | | Merge-request: 2344 Reviewed-by: Tom Cooksey
| * Support building with desktop OpenGL managed via EGLTom Cooksey2010-04-149-84/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mostly replaces lots of QT_OPENGL_ES defines with QT_NO_EGL instead. It also switches off EGL auto-detection by default. This is to make sure we default to using GLX on systems with both EGL and desktop OpenGL. If -opengl es1|es2 or -openvg is specified, then EGL auto-detection is switched back on (as a requirement. If configure auto-detects OpenGL ES it also switches on EGL auto-detection, but failue then just disables both EGL & OpenGL. As a side effect, this patch also fixes building Qt when both EGL and glx are avaliable, as they are in Mesa >= 7.8.0. Reviewed-by: Trond Task-number: QTBUG-9691
| * Print more information when debugging X11 Visual selectionTom Cooksey2010-04-141-0/+10
| | | | | | | | Reviewed-By: TrustMe
| * Fix gcc compile warning in qstatictext.cppEskil Abrahamsen Blomfeldt2010-04-141-1/+1
| | | | | | | | | | | | Synchronize order of initialization with order of declaration. Reviewed-by: TrustMe
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-304669-165340/+343604
| |\
| * | Avoid taking sqrt of negative number in FT font engineEskil Abrahamsen Blomfeldt2010-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When using a reflecting matrix, the determinant will be -1, thus the call to sqrt() will return NaN. Same fix as in 0fa878c4d2. Task-number: QTBUG-9442 Reviewed-by: Trond
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-1522-65/+344
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
| * \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-1422-65/+344
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-1422-65/+344
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1314-8/+133
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1314-8/+133
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope
| | | | | * | Fix QNX screen initializationJohannes Zellner2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
| | | | | * | tst_qftp: Attempting to reproduce a crashMarkus Goetz2010-04-131-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7359
| | | | | * | QNAM HTTP: Do not pipeline with WebLogic serversMarkus Goetz2010-04-131-0/+2
| | | | | | |
| | | | | * | Autotest: update path location on the test serverThiago Macieira2010-04-133-3/+3
| | | | | | |
| | | | | * | Autotest: update location of fluke.gif on test serverThiago Macieira2010-04-131-1/+1
| | | | | | |
| | | | | * | Make qsTr work in global scopeKent Hansen2010-04-137-3/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search up the call stack to find the first non-empty source URL. Also and add an autotest for the QtScript translator functions since there was none (their presence was checked, but not their behavior...). Task-number: QTBUG-9775 Reviewed-by: Olivier Goffart
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-0/+25
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide overview for Symbian capabilities.
| | | | * | | Provide overview for Symbian capabilities.Frans Englich2010-04-131-0/+25
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each individual class which requires special capabilities is documented, but for finding out what to sign with, it's convenient to have it summarized in a single place. 0dcfe6f813d75da55c6183acac9a2cdfe2381594 is a related commit. Task-number: QTBUG-9342 Reviewed-by: Iain
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-133-3/+15
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Not possible to show selected text in virtual keyboard Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro
| | | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-04-135-5/+12
| | | | |\ \
| | | | | * | Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are valid cases where Qt .flm files found under /epoc32/tools/makefile_templates/qt/ have newer timestamp than those in Qt repo one is developing against but still need to be overwritten, so always export .flm files when the timestamp is different instead of just when the files to be exported are newer. Task-number: QT-3253 Reviewed-by: TrustMe
| | | | | * | Make qmake possible to build with mingw using qmake.proMiikka Heikkinen2010-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing libraries Reviewed-by: Marius Storm-Olsen
| | | | * | | Not possible to show selected text in virtual keyboardSami Merila2010-04-131-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Sym^3 when virtual keyboard is opened, text selection is not carried over from editor-like widget to the VKB. This is due that new implementation of AVKON FEP manager requires that clients indicate with editor flags that they can handle text selection. Task-number: QT-3277 Reviewed-by: Janne Anttila
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-131-1/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix typos, there is no QT_NO_SSL
| | | | * | | Fix typos, there is no QT_NO_SSLMarkus Goetz2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago Reviewed-by: andreas
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-133-53/+170
| | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: Single Click UI support for SD 9.2 time-box
| | | | * | QS60Style: Single Click UI support for SD 9.2 time-boxSami Merila2010-04-133-53/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Final commit for this task. For widgets that use the highlighted list/table graphic, style now supports pressed state for the highlight. Style filters mouse press and release events and sets the highlight graphics to be correct based on mouse events (i.e. touch) it gets. Task-number: QT-2298 Reviewed-by: Alessandro Portale
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-14315-2652/+4612
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (71 commits) Add QML documentation for validators Updates to the module documentation Fix minor typo in docs Revert "qdeclarativefocusscope works fine as a parallel test" qdeclarativefocusscope works fine as a parallel test Reduce warnings at shutdown Image with PreserveAspect enabled with either width or height defined should implicitly update the undefined axis to follow the aspect ratio Fix GridView.onRemove animation in photoviewer. Reduce warnings at shutdown Fix QT_NO_DESKTOPSERVICES Compiled bindings should not print warnings where normal bindings don't Update references links Move example code into separate files to make sure they compile Include qvariant.h as a convenience as context properties Merged 'orientation' into 'runtime' context property in qmlruntime Add 'runtime' property to the rootContext of DeclarativeViewer Temporarily disable tests that require compilation Fix qdeclarativedom test Further improve failure output Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystem ...
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-144-6/+19
| |\ \ \ \ \ \
| | * | | | | | Updates to the module documentationmae2010-04-143-4/+17
| | | | | | | |
| * | | | | | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that regExp doesn't have a type, and so it is 'documented' as string. Task-number: QTBUG-9412
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-14118-1181/+1833
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-1412-5/+109
| |\ \ \ \ \ \
| | * | | | | | Revert "qdeclarativefocusscope works fine as a parallel test"Aaron Kennedy2010-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scratch that, qdeclarativefocusscope does not work fine as a parallel test. This reverts commit 72fe46a6c72eb14cfc50cf59f372eb2872e867a0.
| | * | | | | | qdeclarativefocusscope works fine as a parallel testAaron Kennedy2010-04-141-0/+1
| | | | | | | |
| | * | | | | | Reduce warnings at shutdownAaron Kennedy2010-04-149-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9799 Reviewed-by: Alexis Menard
| | * | | | | | Image with PreserveAspect enabled with either width or height defined should ↵Joona Petrell2010-04-143-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicitly update the undefined axis to follow the aspect ratio Task-number: Reviewed-by: Martin Jones
| * | | | | | | Fix minor typo in docsAlan Alpert2010-04-141-1/+1
| |/ / / / / /
| * | | | | | Fix GridView.onRemove animation in photoviewer.Yann Bodson2010-04-141-2/+2
| | | | | | |
| * | | | | | Reduce warnings at shutdownAaron Kennedy2010-04-147-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9799
| * | | | | | Fix QT_NO_DESKTOPSERVICESTasuku Suzuki2010-04-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2359 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alexis Menard2010-04-1463-493/+936
| |\ \ \ \ \ \
| | * | | | | | Compiled bindings should not print warnings where normal bindings don'tAaron Kennedy2010-04-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9813