summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2866-348/+971
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: don't falsely complain about mismatched codecfortr Fix QSettings default paths not being initialized when setPath() is called add directories with sources to list of project roots add -codecfortr option sanitize lupdate's behavior regarding SUBDIRS projects absorb cmdline tests into "good" structure add ability to set working dir for test support multiple output files fix printing output from failed command unshare pro post-processing code complain if both sources and projects are given on the cmdline still complain if only ts files where specified on the cmdline do not sort the TS files fix bogus warning message
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2866-348/+971
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: don't falsely complain about mismatched codecfortr Fix QSettings default paths not being initialized when setPath() is called add directories with sources to list of project roots add -codecfortr option sanitize lupdate's behavior regarding SUBDIRS projects absorb cmdline tests into "good" structure add ability to set working dir for test support multiple output files fix printing output from failed command unshare pro post-processing code complain if both sources and projects are given on the cmdline still complain if only ts files where specified on the cmdline do not sort the TS files fix bogus warning message
| | * don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-2712-13/+164
| | | | | | | | | | | | normalize the user input first
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Daniel Molkentin2010-01-2754-322/+788
| | |\ | | | | | | | | | | | | staging-4.6
| | | * add directories with sources to list of project rootsOswald Buddenhagen2010-01-276-3/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the pro file for the translations lives in a sibling tree of the actual source tree, messages from included headers wouldn't have been collected, as they were not considered part of the project. Task-number: QTBUG-7495
| | | * add -codecfortr optionOswald Buddenhagen2010-01-271-2/+17
| | | | | | | | | | | | | | | | this has always been kind of an omission ...
| | | * sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-2741-98/+592
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, the semantics of nesting projects were pretty bizarre: the list of TS files grew ever as the subdirs were visited. the source files otoh were cleared for every project. this meant that some TS files were updated over and over again, each time with different data. this is obviously total nonsense, so there is no compatibilty to keep. so here come the new semantics: - each project is scanned separately. it has separate include paths and may override the inherited CODECFORSRC. - the messages from all sub-projects are merged - if a sub-project has a TRANSLATIONS entry, it is "detached" from its parent project, thus starting an own merged translator. it is also possible to name an empty set of TS files to simply exclude the sub-project. - CODECFORTR can be specified in each project with TRANSLATIONS - if TS files are specified on the command line, they override TRANSLATIONS from the top level project and stop processing of detached projects alltogether. if multiple top-level projects are specified, they are all merged. this is somewhat slower, as now includes are re-scanned per project, while previously all sources were simply accumulated and scanned as one project. this can be fixed retroactively if needed.
| | | * absorb cmdline tests into "good" structureOswald Buddenhagen2010-01-276-42/+4
| | | |
| | | * add ability to set working dir for testOswald Buddenhagen2010-01-271-7/+13
| | | |
| | | * support multiple output filesOswald Buddenhagen2010-01-271-10/+14
| | | |
| | | * fix printing output from failed commandOswald Buddenhagen2010-01-271-1/+1
| | | |
| | | * unshare pro post-processing codeOswald Buddenhagen2010-01-275-216/+73
| | | | | | | | | | | | | | | | | | | | lrelease needs only the TRANSLATIONS value anyway, so there is hardly anything to share for real
| | | * complain if both sources and projects are given on the cmdlineOswald Buddenhagen2010-01-271-0/+4
| | | |
| | | * still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-271-7/+7
| | | |
| | | * do not sort the TS filesOswald Buddenhagen2010-01-272-3/+1
| | | | | | | | | | | | | | | | really no point in doing so ...
| | | * fix bogus warning messageOswald Buddenhagen2010-01-271-4/+1
| | | |
| | * | Fix QSettings default paths not being initialized when setPath() is calledDaniel Molkentin2010-01-271-19/+25
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only coincidently worked on Linux, because it creates a QSettings object to read system settings before any user data was executed, thus initializing the static default path data. However, if only the SystemPath was modified, the UserPath never got initialized on non-Linux platforms, causing settings for the users below $PWD. Also, it removes unncessary checks and mutex locks, which should give a slight speed up. Reviewed-By: dt
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-286-16/+33
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QComboBox drawn incorrectly in RightToLeft mode Removing unneeded code from QFontEngine::getGlyphPositions() Added a selfsigned version of sqlite3.sis Added support for embedded sis name/uid patching for Symbian Polishing QS60Style by removing compiler warning
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-276-16/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QComboBox drawn incorrectly in RightToLeft mode Removing unneeded code from QFontEngine::getGlyphPositions() Added a selfsigned version of sqlite3.sis Added support for embedded sis name/uid patching for Symbian Polishing QS60Style by removing compiler warning
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-01-273-4/+20
| | |\ \
| | | * | Removing unneeded code from QFontEngine::getGlyphPositions()Alessandro Portale2010-01-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two QVarLengthArray resizes and one local int variable less. Reviewed-by: Simon Hausmann modified: src/gui/text/qfontengine.cpp
| | | * | Added a selfsigned version of sqlite3.sisMiikka Heikkinen2010-01-271-0/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | Added support for embedded sis name/uid patching for SymbianMiikka Heikkinen2010-01-271-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch_capabilities.pl script now also patches any embedded sis file entries in pkg to embed corresponding *_selfsigned.sis instead. Also the script now removes dependencies to other packages from patched pkg to reduce unnecessary warnings about missing dependencies when said dependencies were installed via patched sises. Reviewed-by: Janne Koskinen
| | * | | QComboBox drawn incorrectly in RightToLeft modeSami Merila2010-01-271-5/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style does not regard layout orientation when calculating subrects for QComboBox. This leads to a situation where button is not visible on UI with RightToLeft orientation. Task-number: QTBUG-7584 Reviewed-by: Alessandro Portale
| | * | Polishing QS60Style by removing compiler warningSami Merila2010-01-273-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes one compiler warning caused by animation support additions (member variables are initialized in incorrect order in default constructor). Also, removing unnecessary struct variable and one unnecessary scope definition. Reviewed-by: Alessandro Portale
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-282-0/+708
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Add additional text and painting benchmarks.
| * | | Add additional text and painting benchmarks.Michael Brasser2010-01-282-0/+708
| | | | | | | | | | | | | | | | | | | | These benchmarks have been moved in from the kinetic-declarativeui branch as they are not QML specific.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-275-8/+31
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid call markParentDirty twice in prepareGeometryChange Added a warning to QGLWidget::renderText(). Compiler warning.
| * | | Avoid call markParentDirty twice in prepareGeometryChangeLeonardo Sobral Cunha2010-01-273-4/+9
| | | | | | | | | | | | | | | | Reviewed-by: bnilsen
| * | | Added a warning to QGLWidget::renderText().Trond Kjernåsen2010-01-271-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renderText() can't be used while a GL 2 paint engine is active on the same device, because it will clash with the GL 1 engine and wreck havoc. We simply don't support that scenario. Task-number: QTBUG-7592 Reviewed-by: Samuel
| * | | Compiler warning.Bjørn Erik Nilsen2010-01-271-2/+2
| | | |
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Pulse Build System2010-01-272-2/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Add lower/raise to context menu.
| * | | Designer: Add lower/raise to context menu.Friedemann Kleint2010-01-272-2/+5
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-592
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-2736-561/+1008
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits) Compile with no-webkit - add missing semi-colons. Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor ...
| * | | | Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-2635-559/+1006
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: (32 commits) Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required ...
| | * | | | Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-264-36/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setParentItem is causing the previous opacity/visible updates to be discarded because the dirty flags were not propagated to the new parent. Also removed some unnecessary 'markDirty' and 'update' calls. Task-number: QTBUG-6738 Reviewed-by: bnilsen
| | * | | | Stabilize tst_QGraphicsScene::polishItems2 (new test)Bjørn Erik Nilsen2010-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are only interested in getting the posted MetaCall events delivered, so we can get away with sendPostedEvents() instead of processEvents(). Makes the test also pass on Mac g++ carbon 32.
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2634-525/+881
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (30 commits) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. ...
| | | * | | | Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7530 Reviewed-by: Kim
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2533-524/+880
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits) Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. ...
| | | | * | | | Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | | Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-252-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid traversing the whole child hierarchy when opacity changes unless there are children with graphics effects. Reviewed-by: Bjørn Erik Nilsen
| | | | * | | | Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-253-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to invalidate the graphics source pixmap cache for both child items and parent items when changing the opacity of a graphics item. Reviewed-by: Bjørn Erik Nilsen
| | | | * | | | Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-251-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply skip the updates that are outside the replay widget's bounds. Reviewed-by: Gunnar Sletta
| | | | * | | | Small optimization in raster paint engine.Samuel Rødal2010-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't repeatedly update the pen / brush if no pen / brush is set. Reviewed-by: Gunnar Sletta
| | | | * | | | Another ASSERT while deleting spansGabriel de Dietrich2010-01-252-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That rare case when we are deleting the last span was not being taken care of. Unbelievable but true. Auto-test included. Reviewed-by: Thierry Reviewed-by: leo Task-number: QTBUG-6004
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-2527-509/+756
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits) Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper Improve performance of QGraphicsItem::setParentItem. Make sure cursor is painted at the correct position when we are using IM. Purely cosmetic (formatting) changes to GL2 engine's GLSL Use an attribute value for the PMV matrix rather than a uniform Remove unnecessary depth uniform from GL2 engine's GLSL ...
| | | | | * | | | Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a very operation in DirectFB and saves a fair bit of overhead. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | | * | | | Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-223-18/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were processed immediately, so there was a fair chance that we could end up doing a virtual function call on items that were not fully constructed. This patch is also an optimization, since we never remove anything from the vector. Auto-test included. Reviewed-by: Jan-Arve
generated by cgit v0.12 at 2024-12-04 22:34:12 (GMT)