summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-196-24/+42
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * Record images on more than just the first frame.Alan Alpert2010-11-161-1/+1
| | | | | | | | | | | | 8fc0d1c36cae1b0 introduced this bug when recording new visual tests. Task-number: QTBUG-14792
| * Turn off font antialiasing during tests.Alan Alpert2010-11-161-10/+9
| | | | | | | | | | | | | | | | | | | | | | Font antialiasing varies from machine to machine, and so is too unstable Also switching to a monospaced font in visual tests to attempt to pre-empt another possible source of instability. This commit also slightly increases verbosity of test failure messages to be more useful in the CI system Task-number: QTBUG-14792
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-151-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update all qmlvisual tests Take snapshots starting from the first frame Stabilize visual test focusscope/test3.qml ListView: items with size < 1.0 were layed out incorrectly. ListView.SnapToItem with ListView.StrictlyEnforceRange is broken. Fix failing visual tests Remove unneeded semicolons.
| | * Take snapshots starting from the first frameAlan Alpert2010-11-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Partly because it's invaluble for the times people forget to record a test as a snapshot, partly because it provides more data on the initial state of the test case. Task-number: QTBUG-14792
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-119-12/+282
| |\ \ | | |/
| * | qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
| | | | | | | | | | | | Task-number: QTBUG-15081
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-117-10/+10
| |\ \
| * | | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-13939
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1218-59/+518
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-118-11/+282
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Coding style: bang cleanup. Removed call to glFinish, obsoleted by fence syncs. Helper-side support for QMeeGoFenceSync. Plugin-side support for creating/destroying/waiting on fence sync. Added MeeGo graphicssystem entry points for KHR_fence_sync. Trailing whitespace fixes.
| | * | | Helper-side support for QMeeGoFenceSync.Michael Dominic K2010-11-118-11/+282
| | | |/ | | |/| | | | | | | | | | | | | Merge-request: 2502 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-111-1/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove pointless assignment of deprecated variable fix tst_headers Fixed a shell syntax error in configure Clear X11 structure before use Make operator QRectF const Fix GC-related crash in QScriptValue::setData() get rid of dependency on QtGui Removed implicity QtGui linking from icd.pro as it is not needed. DFB: Make sure QPixmap::hasAlpha is respected fix build on mingw Fix some painting issues in QDirectFBPaintEngine QNAM: Do not need QNetworkSession in AlwaysCache load mode Don't crash if QScriptClass property getter returns an invalid value QNAM: Remove dead waitForUpstreamBytesWritten() code QNAM: Remove dead waitForDownstreamReadyRead() code fix memleak in test
| | * | remove pointless assignment of deprecated variableOswald Buddenhagen2010-11-101-1/+0
| | |/
| * | Doc: Fixing typoSergio Ahumada2010-11-093-4/+4
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-085-7/+7
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-055-7/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-035-7/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-035-7/+7
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
| | | | | * Doc: Fixing typoSergio Ahumada2010-11-015-7/+7
| | | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-051-2/+2
| |\ \ \ \ \
| | * | | | | Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | | | Doc: Updated the configuration file to use the Qt 4.7 style sheets.David Boddie2010-11-051-34/+219
| | | | | |
| * | | | | qdoc: Remove leading QML: text from certain node names.David Boddie2010-11-041-1/+5
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Martin Smith
* | | | | Ensured that the document nodes are sorted in the generated index.David Boddie2010-11-081-2/+69
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13828
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (72 commits) Fix opening a network session multiple times in succession. Fix synchronous dispatch in ICD in non-main threads. Russian translation update QNAM HTTP: Download last chunk properly when readBufferSize() limited Remove code changes that were NOT intended as part of the fix Prevent access to non-existent memory in QGL2PEXVertexArray Wordwrap QInputDialog label in Symbian Prevent excessive seeks in xbm detection Use qtmain.lib to provide entry point for all Symbian applications Give the toplevel widget a layout Doc: Correcting character escape bug fix tests when using Qt in a namespace Fix tst_symbols auto test Doc: Clarified the lifetime of the session bus connection. Doc: Added a snippet showing the default BorderImage tiling behavior. Doc: using pointer member variables and language change Doc: Added more instructions to help with device file permissions. Doc: Mentioned default values for the BorderImage tile modes. Document the difference between +0.0 and -0.0 for QPointF and QSizeF. trivial: fix build ...
| * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-042-20/+7
| | |\ \ \ \ | | | |/ / /
| | * | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| | | | | |
* | | | | | Prevent multiple modprobe messages for the same phoneShane Kearns2010-11-051-24/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up some unnecessary code in the serenum_unix file. Add the device only once to the list used for printing info about devices with no serial drivers. Add each ACM interface ID, trusting the numbers given in the master interface. The existing code of searching for the slave interface would have been appropriate for a user-mode device driver, but we only need the interface numbers as we are going to use existing device drivers via the tty devices Reviewed-By: axis
* | | | | | Fix detection of N95 with linux 2.6.34+Shane Kearns2010-11-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux cdc-acm driver detects the debug port on some Nokia phones automatically When it does, it creates two ttyACMx devices and the symlink in /dev/serial/by-id contains the CDC master interface number. In contrast the generic usbserial driver creates a symlink containing the CDC slave interface number. This is because it knows nothing about CDC and is just looking for BULK IN/OUT interfaces that might be serial ports. This change creates match strings for both the master and slave interfaces, so the phone is detected if either driver is loaded. Reviewed-By: axis
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-042-4/+34
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-4/+34
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
| | * | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-14979
| | * | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | |/
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-032-20/+7
|\ \ \ | |/ /
| * | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| | |
| * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| |/ | | | | | | | | as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs.
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-011-0/+8
|\ \ | |/
| * Fix QML visual tests on Mac.Yann Bodson2010-11-011-0/+8
| | | | | | | | Task-number: QTBUG-14792
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-4/+2
|\ \ | |/
| * Update webview visual tests to new skip modeAlan Alpert2010-10-291-4/+2
| | | | | | | | | | | | | | | | New mode requires them to at least compile. Now that I've noticed this, removing that check on compile failures in QDeclarativeTester. Task-number: QTBUG-14792
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-294-6/+33
|\ \ | |/
| * Add 'skip' property that QML visual tests can useAlan Alpert2010-10-294-6/+33
| | | | | | | | | | | | | | | | | | | | This property can be set with a reason to skip the test (i.e. known bug) and the failure will not count for blocking purposes. This change also alters one of the failing tests to use the new property Task-number: QTBUG-14792 Reviewed-by: Michael Brasser
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-276-6/+6
|\ \ | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-266-6/+6
| |\ \ | | |/
| | * Doc : Fixing typo.Sergio Ahumada2010-10-266-6/+6
| | |
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2637-272/+546
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2527-261/+215
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-112/+60
| | | | | | | | | | | | | | | | | | | | | Moving code from qmeegopixmapdata there. Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v0.12 at 2024-12-08 19:03:52 (GMT)