| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
src/gui/image/qpnghandler.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |\ |
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/image/qpnghandler.cpp
src/opengl/qwindowsurface_gl.cpp
|
| | | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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:
Changes to driver workarounds.
Switch to raster also when last window is destroyed (on MeeGo).
Fix accidental population of the disk cache with partial content
Fix disk cache interaction for range retrieval HTTP requests.
Clipboard/Windows: Fix a hang when sending to non-responsive clients.
|
| | | | |\ \ \
| | | | |/ / |
|
| | | | | |\ \
| | | | | |/
| | | | |/|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Changes to driver workarounds.
Switch to raster also when last window is destroyed (on MeeGo).
Clipboard/Windows: Fix a hang when sending to non-responsive clients.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Check if clipboard viewer is responsive before sending the
contents. This prevents Qt Creator from hanging when copying
text while a debugging session with a crashed/stopped
debuggee is in progress.
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Task-number: QTBUG-17465
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This included added a license header on a moc file. Its nasty, but has
to stay like that until we have a better sollution for generating moc
files on uikit
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes a couple of on-startup leaks.
|
| | | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
|
| | | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Jørgen Lind
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Processing posted Qt events before the event loop integration is started
may lead to the process being killed for taking too long time before the
native event loop is running.
Since event loop integrations are required to install a timer that does
processEvents anyhow, the Qt events will be processed even without doing
it explicitly in advance.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We realised that we couldn't keep on adding virtual functions for all
specific needs so we made one virtual function which takes a string
parameter which enables the implementation to return anything.
It seems a bit odd to have a virtual function as an accessor for a class
with only 1 virtual function. But the idea is that we don't want a
void * in the core lighthouse api. Also, the implementations should
decleare more functions to do the heavy lifting of getting the handles
Reviewed-by: paul
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Jørgen Lind
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Sometimes in applications code you need to get the native handles for
displays, egl displays etc. The native interface class is how you
access these handles.
Reviewed-by: paul
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These are needed for compositor applications to be able to send the
raw scan codes to the clients.
Reviewed-by: Jørgen Lind
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Since the other platforms are not aware of the
unified toolbar, we move all the specific behaviors
in #ifdef sections.
Reviewed-by: Denis Dzyubenko
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Richard Moe Gustavsen
|
| | |\ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Samuel Rødal
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Richard Moe Gustavsen
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
All utility functions to call display: are now
placed in qt_cocoa_helpers_mac.mm
Reviewed-by: Richard Moe Gustavsen
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Richard Moe Gustavsen
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This allows to trigger a drawRect: on the NSView
associated with a QWidget.
Reviewed-by: Richard Moe Gustavsen
|
| | |_|_|_|_|/ / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Keep the implementation in separate
qpixmapdata_poolgl.cpp file until the pooling has
been verified and confirmed to work ok.
Task-number: QTBUG-15253 QTBUG-17850
Reviewed-by: Samuel Rødal
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
There is usually only one screen on the emulator and it was incorrectly
assumed that ScreenDevice() would return null for a non-existing
screen. It panics instead so the entire call must be skipped.
Reviewed-by: Sami Merila
|
| |\ \ \ \ \ \ \ \
| |_|_|_|/ / / /
|/| | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-13593
Reviewed-by: Richard Moe Gustavsen
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When QSplashScreen waits for the window to be fully shown, we shouldn't
re-enter the event loop by processing posted events.
Reviewed-by: axis
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Merge request: 1111
Doc: inform better about how you can tweak Qt apps on Mac
Mac: add support for closing dialogs using Cmd-D
Cocoa: use mouse location from event
Cocoa: implement eventdispatcher flag excludeUserInputEvents
Cocoa: processEvents does not always send posted events
Added QMdiArea::tabsMovable and tabsClosable
Enable the widthForHeight() test case.
Fix some wrong tests in heightForWidth()
Fix and enable the tests that were disabled.
Fixed a double selection in QFileDialog when saving
fix qFadeEffect windowOpacity issue on Windows
Cleanup unused QAccessWidget
Fixed a problem with toolbars not relayouting
Compile fix on solaris
Autotest illustrating Qt::InitialSortOrderRole
Mention when the role was introduced
Add a way to set QHeaderView initial sort order
Doc: Fixing typo
|
| | |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This is offcourse important, and the bug was revealed when
calling qApp->processEvents(QEventLoop:excludeUserInputEvents),
as this call would que up mouse events and dispatch them later on.
And offcourse, the mouse would have changed position at that point.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
When executing modal windows, the event dispatcher would not respect
the QEventLoop::ExcludeUserInputEvents. This patch implements
this support. The way it now works is that we fetch events manually
from NSApplication and do the dispatching ourselves in those cases.
From earlier research, this patch has shown to be a bit unreliable
in some cases, and might have some sideeffects. Hence the reason
we avoid it if we can. But it still feels better that we try to
follow the flag in those few application that wants to do this.
|
