summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| |/
| * 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-272-8/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-261-6/+22
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-251-6/+22
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | | | * 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
| * | | | Updates to new Symbian DEF file systemIain2010-01-261-7/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-252-36/+67
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Use HighlightAllOccurrences to have highlighting after full text search.
| | * | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-222-36/+67
| | |/ | | | | | | | | | | | | | | | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
| * | Improve DEF file enable/disable mechanism on SymbianIain2010-01-221-2/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide configure flag to enable/disable the use of DEF files on Symbian. A useful side-effect was that it cleaned up how we control DEF files from qbase.pri and in WebKit. -nokia-developer still disables DEF files, as it triggers the autotest exports, which are not frozen into the DEF files. Disabling DEF files means that there is no BC with previously released versions of Qt, so this should only be used for development purposes. .pro files can specify custom locations for DEF files by setting defFilePath. Task-number: QTBUG-6556 Reviewed-by: Jason Barron
* | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0145-1120/+2361
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-221-4/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-221-4/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | * | Fixed compile when Qt is configured with -no-webkitRohan McGovern2010-01-221-2/+2
| | | | |
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-221-4/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | * \ Merge remote branch 'origin/master'Olivier Goffart2010-01-0847-1084/+5000
| | | | |\ \
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-161-4/+5
| | | | |\ \ \
| | | | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-1329-547/+1120
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
| | | | | * \ \ \ Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-11-1355-603/+933
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '4.6' of c:\dev\qt-graphics-4.6Gunnar Sletta2009-11-0426-90/+273
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | | | | | | | | | QtHelp: Minor clean-ups.ck2010-01-222-7/+4
| |/ / / / / / / / /
| * | | | | | | | | Assistant: Fix compliation for -no-webkit.ck2010-01-221-2/+5
| |/ / / / / / / /
| * | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-219-20/+192
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * | | | | | | | | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-212-36/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
| * | | | | | | | | Assistant: Simplify check for SQLITE plugin.ck2010-01-211-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | | | | | | | Assistant: Fix translations.ck2010-01-211-15/+18
| | | | | | | | | |
| * | | | | | | | | Force the creation of the default collection file directory.kh12010-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes error message after starting on a clean working system.
| * | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-182-2/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Assistant: Extend list of file types to open internally.ck2010-01-141-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Assistant: Use isLocalUrl() to decide whether a page is internal.ck2010-01-143-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | | | | | | | | Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Assistant: Extend 54d1ad11a4f35c0484418e5d18537daaccc2c6ab.ck2010-01-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot one place.
| * | | | | | | | | | Assistant: Open non-HTML content in external application.ck2010-01-144-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5583 Reviewed-by: kh1
| * | | | | | | | | | Use QTemporaryFile for opening documents in external applications.ck2010-01-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| * | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-131186-1253/+1260
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-123-11/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix compilation of builds without WebKitSimon Hausmann2010-01-121-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-0811-55/+240
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-2638-916/+4604
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * | | | | | | | | | | | | Assistant: Refactor help engine wrapper.ck2009-12-213-144/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class had a lot of implementation details in the header, which were moved to an internal private class.
| * | | | | | | | | | | | | Assistant: Fix console output glitch.ck2009-12-161-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | qdbus: short forms to get/set propertiesGiuseppe Bilotta2009-12-151-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a property to be given as third parameter instead of a method. If no other parameter is given, the property value is returned; if a fourth parameter is given, the property is set to the given value. This allows the syntax qdbus service path property as a short form of qdbus service path org.freedesktop.DBus.Properties.Get property and the syntax qdbus service path property value as a short form of qdbus service path org.freedesktop.DBus.Properties.Set property value If the third parameter is neither a method nor a property, the error message for the missing method is returned. Merge-Request: 1143 Reviewed-By: Thiago Macieira
| * | | | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-153-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
generated by cgit v0.12 at 2024-11-10 11:05:27 (GMT)