summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into 4.8-earthDenis Dzyubenko2011-03-2858-316/+1816
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-243-12/+40
| |\ | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-233-12/+40
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Icon in QMessageBox::question is deformed on Symbian Prevent crash when connecting signal in splitview GraphicsViews: Focused widget is not visible after orientation change GraphicsViews: Focused widget is not visible after orientation change Add missing nullify for the s60 style's background pixmap pointer.
| | | * Icon in QMessageBox::question is deformed on SymbianSami Merila2011-03-231-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageBox icons are deformed on Qt/S60, since style creates all icons with 1:1 width:height ratio. Based on S60 documentation messagebox icons are of 4:3 ratio. This is the same ratio between all the S60 releases. Task-number: QTBUG-14953 Reviewed-by: Laszlo Agocs
| | | * Prevent crash when connecting signal in splitviewSami Merila2011-03-231-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no focusitem when connecting a signal, splitview crashes. This is caused by null pointer use. Prevent the crash by checking the pointer. Task-number: QTBUG-16572 Reviewed-by: Guoqing Zhang
| | | * GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up previous fix a little bit, by merging if-statements. Task-number: QTBUG-17576 Reviewed-by: Guoqing Zhang
| | | * GraphicsViews: Focused widget is not visible after orientation changeSami Merila2011-03-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is a graphicsview with input widget focused and splitview is open, and we rotate the device from Portrait to Landscape (or vice versa), the input widget is no longer visible in the splitview rect. This only happens if there are scrollbars visible in the view. Reason is that the input widget is tried to ensure visibility for before window surface is valid. In these cases, make the input widget visibility re-location happen after window server indicates that the view is now visible. Task-number: QTBUG-17576 Reviewed-by: Guoqing Zhang
| | | * Add missing nullify for the s60 style's background pixmap pointer.Laszlo Agocs2011-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt apps would crash during orientation change without setting m_background to null after deleting it. Reviewed-by: Sami Merila
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-2413-10/+109
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) Remove the use of the QtTest baseline feature I reverted Revert "Add a feature to QTestLib to correct benchmark results." Use the ARM version of UTF-8 detection in the Neon code Update the data files for the QString benchmark test Fix a bug in the SSE2 UTF-8 decoder. Add ARM Neon versions of fromLatin1 and fromUtf8 Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE) Add baselines and zeros to the benchmarks. Add an UTF-8 conversion on trusted data and no BOM. Make it easier to write a UTF-8 conversion on trusted data Add the missing tests and 4-byte UTF-8 sequences Improve the code and avoid unnecessary stores Add an UTF-8 conversion optimised for ASCII using SSE2 Add an UTF-8 conversion code that is optimised for ASCII Add a stateless copy of the Qt 4.7 UTF-8 codec. Add UTF-8 code benchmarks Improve a little more the core loop and propagate to the other code Reduce the number of operations in the main loop Add an SSE4 version using PMOVZXBW and PSRLDQ Attempt to improve the epilog code ...
| | * | | Fix warning about copy constructor not initialising base explicitlyThiago Macieira2011-03-221-0/+1
| | | | |
| | * | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-2265-329/+1937
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp
| | * | | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-2112-9/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-224-11/+32
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-224-11/+32
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed drawImage() not to attempt drawing null images on openvg. QS60Style: Update placeholder texture to real one
| | | * | | QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the background texture has been created, update it to all widgets. This corrects most cases where texture is used outside of QS60Style. It is still possible to access the placeholder texture and draw it, if: a) QPalette::Window is accessed before drawing even one widget b) Painting the texture happens without using QS60Style Task-number: QTBUG-14910 Reviewed-by: Laszlo Agocs
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-222-6/+7
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-03-211-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't crash calling QTextDocument::blockBoundingRect on invalid block
| | | * | | Don't crash calling QTextDocument::blockBoundingRect on invalid blockEskil Abrahamsen Blomfeldt2011-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the block is invalid, QTextBlock::layout() will return 0 and we would dereference a null pointer. Task-number: QTBUG-18192 Reviewed-by: Jiang Jiang
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-211-5/+6
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change the pooled QGLPixmapData to be backed by QVolatileImage. Started changes-4.7.4 file Changed s60 style not to rely on QPixmapData::toNativeType(). Add missing bitmap locking to QVGPixmapData::fromNativeType. Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
| | | * | | Changed s60 style not to rely on QPixmapData::toNativeType().Laszlo Agocs2011-03-211-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing VG (and GL) pixmapdata to support toNativeType() with type VolatileImage is unnecessary. It is cleaner to try doing a fromNativeType() with bitmap+mask and fall back if that results in a null pixmapdata. Reviewed-by: Jani Hautakangas
| * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-224-13/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. Add /q switch to QMAKE_DEL_FILE command in symbian
| | * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-194-13/+33
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-194-13/+33
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro
| | | | * | | Add flag for forcibly propagating backing store alpha to framebufferGareth Stockwell2011-03-184-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the following rules applies to the creation and blitting of the Symbian raster backing store: 1. Creation of backing store with an alpha channel: Backing store has an alpha channel only if !QWidget::isOpaque. 2. Pre-filling of backing store prior to paint loop: Backing store is filled with transparent pixels if !QWidget::isOpaque. 3. Blitting of backing store: CGraphicsContext::EDrawModeWriteAlpha is used (meaning that backing store alpha values are propagated into the frame buffer), if QWidget::isOpaque. In order for the direct camera viewfinder to be visible on DSA devices, alpha=0 must be written into the framebuffer in the region where the viewfinder will be displayed. This requires a backing store with an alpha channel (1), use of CGraphicsContext::EDrawModeWriteAlpha (3), but not pre-filling of the entire backing store (2). This patch adds a new enum value, QWExtra::BlitWriteAlpha, which can be used by camera backends to achieve the desired behaviour. Task-number: QTMOBILITY-1278 Reviewed-by: Jani Hautakangas
| * | | | | | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-2138-121/+403
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpnghandler.cpp src/opengl/qwindowsurface_gl.cpp
| * \ \ \ \ \ \ Merge branch 'merge_raster'Fabien Freling2011-03-1714-145/+338
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'raster/master' into merge_rasterFabien Freling2011-03-1714-145/+338
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add an overloading function to flush().Fabien Freling2011-03-162-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of the unified toolbar, we don't need as much arguments for flush(). So we overload flush() to only take one argument, the widget. Reviewed-by: Samuel Rødal
| | | * | | | | | | Remove the check on flushRequested.Fabien Freling2011-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check on flushRequested was needed since we were flushing the toolbar with the main window, but the flushing is now independent so we don't need it anymore. It is now making us skip some flushing. Reviewed-by: Samuel Rødal
| | | * | | | | | | Merge remote branch 'mainline/master' into merge_rasterFabien Freling2011-03-15165-386/+3876
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Change the way the unified toolbar is flushed.Fabien Freling2011-03-155-37/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flushing of the unified toolbar is no longer tied to the main window, making it more flexible. Task-number: QTBUG-17754 Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | Add the ability to remove a toolbar from the unified toolbar.Fabien Freling2011-02-253-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to toggle the unified look of the toolbar. This is useful for apps going fullscreen since we have to turn the unified look off when entering fullscreen mode. Reviewed-by: Samuel Rødal
| | | * | | | | | | | Move the Mac specific behavior in #ifdef.Fabien Freling2011-02-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the other platforms are not aware of the unified toolbar, we move all the specific behaviors in #ifdef sections. Reviewed-by: Denis Dzyubenko
| | | * | | | | | | | Remove useless variable.Fabien Freling2011-02-232-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | Merge remote branch 'mainline/master' into merge_rasterFabien Freling2011-02-231175-3157/+4660
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Optimize the rendering path for the unified toolbar.Fabien Freling2011-02-155-18/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The over flushing of the toolbar had a huge performance impact so now we only flush the toolbar when necessary and moved the rendering out of the flushing process. Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Remove useless statements.Fabien Freling2011-02-142-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal
| | | * | | | | | | | | Force the repaint during live resize.Fabien Freling2011-02-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During live resize on Mac, it is important to keep up with the resizing of the window, or the application looks sluggish. Calling update() is not enough, since we then are lagging behind the system by going through the event loop. Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Remove useless function.Fabien Freling2011-02-082-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel Rødal
| | | * | | | | | | | | Remove useless variables.Fabien Freling2011-01-311-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Disable subtractOpaqueSiblings when in the unified toolbar.Fabien Freling2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the items in the unified toolbar have non-relevant positions and can't be overshadowed by another widget, we always paint them. Reviewed-by: Samuel Rødal
| | | * | | | | | | | | Move all display: utility functions.Fabien Freling2011-01-274-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All utility functions to call display: are now placed in qt_cocoa_helpers_mac.mm Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Force the display: in the unified toolbar.Fabien Freling2011-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling setNeedsDisplay:, we call have to call display: to avoid flickering. Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Remove useless displayIfNeeded: definition.Fabien Freling2011-01-261-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer needed for the raster engine. We don't need to sync the backing store this way. Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Change variable name.Fabien Freling2011-01-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Move the flushing to [view drawRect:rect]Fabien Freling2011-01-267-98/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of flushing by grabbing the Core Graphics context, we do it directly in the drawRect: method. This approach allows us to call flush() many times and only proceed to flush when the system is ready. Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | Small typo fix.Fabien Freling2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | * | | | | | | | | Merge branch 'unified-toolbar'Fabien Freling2011-01-251-1/+12
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Free memory when disabling the unified toolbar.Fabien Freling2011-01-141-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
| | | * | | | | | | | | | Add utility functions for using Core Graphics contexts.Fabien Freling2011-01-251-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These snippets are often used while managing Core Graphics contexts. Putting them in inlined functions makes code easier to read. Reviewed-by: Richard Moe Gustavsen
generated by cgit v0.12 at 2025-03-23 05:12:53 (GMT)