summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-2423-130/+178
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits) Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-1923-130/+178
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Fixed handling of QInputMethodEvents with nonzero replacementLength. Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. Documented usage of dialogs on Symbian Native file dialog on Symbian^3 Add Location as self signable capability in patch_capabilities.pl Localize .loc and .pkg content based on TRANSLATIONS Bump Qt version to 4.7.2. SSL: Fix for systemCaCertificates being called first on symbian ...
| | * Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-197-27/+63
| | | | | | | | | | | | | | | Task-number: QTBUG-15393 Reviewed-by: axis
| | * Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-182-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was only possible to use EPOCROOT in qt.conf via env variable, while qmake & configure could resolve it also via devices.xml. Changed qt.conf parsing to support $${EPOCROOT} tag and use same resolving logic as qmake & configure. Task-number: QTBUG-15393 Reviewed-by: axis
| | * Make epocroot resolving compatible with more build environmentsMiikka Heikkinen2010-11-182-57/+51
| | | | | | | | | | | | | | | | | | | | | | | | This commit prepares epocroot.cpp and registry.cpp to be compilable by lrelease and corelib. Task-number: QTBUG-15393 Reviewed-by: axis
| | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-186-25/+42
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | Use include(original mkspec) instead of copying of mkspec to defaultMiikka Heikkinen2010-11-161-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having QMAKESPEC_ORIGINAL at the end of the default qmake.conf sets the mkspec too late for scope checks in symbian-mmp.conf and related files. Fixed by changing how default mkspec is handled: it is no longer simply copied over to mkspecs/default by configure but rather included with include statement in the generated mkspecs/default/qmake.conf after setting of QMAKESPEC_ORIGINAL value. This should also fix any issues with relative includes in mkspecs used as default that are not on same level as mkspecs/default folder. Task-number: QTBUG-15159 Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann
| | * | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
| | * | Bump Qt version to 4.7.2.Jason McDonald2010-11-1213-41/+41
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Dynamically register the event number.Michael Dominic K2010-11-222-6/+18
|/ / / | | | | | | | | | Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-196-3/+173
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo. Fix possible missing glyphs in raster engine glyph cache Fix possible corrupted text when gl glyph cache becomes full Check correctly before including SSE4.2 header. Fixed crash when destroying QGLWidget Prevent crash in GL 2 engine when stroking null rectangle. Compile fix. Documentation update for new switching events. Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system. Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| * | | Documentation update for new switching events.Michael Dominic K2010-11-172-1/+31
| | | | | | | | | | | | | | | | | | | | Merge-request: 926 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.Michael Dominic K2010-11-174-2/+142
| | | | | | | | | | | | | | | | | | | | Merge-request: 926 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-171-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Fixing typo Fix possible missing glyphs in text when using GL engine
| | * | Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| | | |
* | | | Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
|/ / /
* | | 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
|\ \ | |/
| * 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
| | |
* | | 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
|\ \ \ | |/ /
| * | 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
| | | | | |
* | | | | | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
|/ / / / / | | | | | | | | | | | | | | | Task-number: QTBUG-13939
* | | | | 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
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-042-20/+7
|\ \ \ \ | |/ / /
| * | | 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.
| * | | 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.
* | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| |/ |/|
* | 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
|/
* Fix QML visual tests on Mac.Yann Bodson2010-11-011-0/+8
| | | | Task-number: QTBUG-14792
* 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
* 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
* Doc : Fixing typo.Sergio Ahumada2010-10-266-6/+6
|
* 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 2025-01-03 23:05:22 (GMT)