| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
Splitview flag should also be updated to inputcontext
QGraphicsView with vertical scrollbar flickers when splitview opens
Splitview: opening a context menu should not re-position of focusItem
Trigger fullscreen transition effects properly on app exit.
Do not use SetSurfaceTransparency() on raster.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-4718
Reviewed-by: TRUSTME
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Avkon calls BeginFullScreen() and EndFullScreen() to trigger the
fullscreen system transition effects for application exit, however
the calls are made too late for Qt apps because the widgets are
already destroyed. Instead, the effects are triggered explicitly
from Qt, before closing the widgets, or from aboutToQuit, whichever
comes first.
Task-number: QT-4718
Reviewed-by: Jani Hautakangas
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When raster graphics system is forced and the HW was capable enough,
we still tried to use SetSurfaceTransparency() on the RWindow to
enable semi-transparency, which is wrong as it only works for
windows that have a separate surface.
Reviewed-by: Jani Hautakangas
|
| | |\ \
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Have the backing store destroyed also in special Symbian scenarios.
Use FixNativeOrientation on Symbian when the application wants it.
QS60Style: itemview item with checkbox and text is drawn incorrectly
Revert "Have the backing store destroyed also in special Symbian scenarios."
Add focus frame support in style sheet
Two QListView autotests do not pass on Symbian^3 releases
tst_QStyle::drawItemPixmap test case fails on Symbian^3
Add the auto detection for OpenVG in configure
Add focus frame support in stylesheet
Make QS60Style to support new Tab graphics in new Symbian releases
GraphicsView is not reset if focusItem is not set when keyboard closes
Check the validity of qt_desktopWidget before dereferencing
Labels are not visible in dialogs with all themes (part2)
Labels are not visible in dialogs with all themes
Enable webkit for symbian-gcce in configure
Enable webkit build for the makefile build system with gcce
Add the rules for gcce in do_not_build_as_thumb.prf
Correct some parameters for the makefile build sytem, armcc and gcce
Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
Do not unnecessarily draw application twice in landscape
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The backing store tracker's registerWidget and unregisterWidget
functions are called when EPartiallyVisible and ENotVisible events
come from WSERV. However if an application sends its window group
to background right after caling show() and before entering the
event loop, there is a chance that all the application will receive
is an ENotVisible event, leading to calling unregisterWidget() without
a previous registerWidget(). In this case the backing store was
not destroyed and the application was consuming GPU memory even while
it was staying in background. This patch ensures registerWidget() is
called always before unregisterWidget() in the Symbian-specific
event handler for ENotVisible, and replaces the previous patch,
a12d41076919a133e63de63dff5c1a131a0564e4, which caused regression
in autotests.
Task-number: QTBUG-18493
Reviewed-by: Gareth Stockwell
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Applications can request the usage of RWindow::FixNativeOrientation()
by setting the new Qt::WA_SymbianNoSystemRotation attribute for their
fullscreen top-level widget (which in practice will either be a
graphics or declarative view). This will fix the underlying EGL
window surface and the QWidget dimensions to the dimension of the
native orientation of the device (typically portrait). The default
auto-rotation can be left enabled, however it will be up to the
application to rotate the drawing. Global notifications, VKB, etc.
will still appear in the proper orientation. Another benefit is
improved performance in the non-native orientation.
Task-number: QTBUG-17742
Reviewed-by: Jason Barron
Reviewed-by: Jani Hautakangas
|
| | | |
| | | |
| | | |
| | | | |
This reverts commit a12d41076919a133e63de63dff5c1a131a0564e4.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTMOBILITY-1494
Reviewed-by: Gareth Stockwell
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fullscreen with softkeys dialogs would draw twice when orientation
was changed to landscape, causing flicker. This happened because
status pane change event and layout change event both caused
redraw with different client area size. Added a check to avoid
handling client area change on account of status pane change, if status
pane is not visible and there was no change in its visibility.
Task-number: QTBUG-18496
Reviewed-by: Sami Merila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The backing store tracker's registerWidget and unregisterWidget
functions are called when EPartiallyVisible and ENotVisible events
come from WSERV. However if an application sends its window group
to background right after caling show() and before entering the
event loop, there is a chance that all the application will receive
is an ENotVisible event, leading to calling unregisterWidget() without
a previous registerWidget(). In this case the backing store was
not destroyed and the application was consuming GPU memory even while
it was staying in background. This patch makes unregisterWidget()
not to check the widget's presence in the m_widgets set, instead
the condition for deleting the backing store is solely an empty set.
Task-number: QTBUG-18493
Reviewed-by: Gareth Stockwell
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
Fix build for Apple gcc
Add platformNativeInterface assessor to QApplication
Lighthouse: Add dummy QSessionManager
Adapt to different uikit resolutions.
Lighthouse: Make directfb conform with ligthhouse gl context api
Compile fix for window surface features. (uikit)
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Paul Olav Tvete
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits)
QLocale: Fixed double to currency string conversion on Mac.
Fix qstringbuilder4 test on mac
Compile on Mac.
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
Use the qt_static_metacall in QueuedConnection
Fix crash after merge of the native symbian thread branch.
Fix bad merge
Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5
Removed useless comment
SSL code: introduce new error value for blacklisted certificates
Disable DEF files by default for symbian-gcce.
HTTP caching internals: fix logic for PreferNetwork and PreferCache
Added a consistency check for number of missing symbols in elf2e32.
Updated def file after symbol removal.
QLocalSocket: fix abort on Windows.
QStringBuilder: add operator += for QString and QByteArray
Dummy commit to trigger pulse.
Fix QMetaObject::indexOfSlot
Fix compilation
Documentation for the initilize_list constructor
...
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If a compositing manager is active, setting
the window pixmap background to None for ARGB windows
makes little sense.
In this case the background should be transparent
Merge-request: 1135
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Use XFixes extension to track changes to
the compositing manager in such a way that
QX11Info::isCompositingManagerRunning()
returns a valid result even if compositing has
changed after the creation of the QApplication
Many thanks to Fredrikh Hoglund for suggesting the
correct approach
Task-number: QTBUG-6044
Merge-request: 1133
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We don't call XTranslateCoordinates anymore, but use the toplevel window
offset that we already store to convert between screen coordinates and
widget coordinates.
Reviewed-by: João Abecasis
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications
|
| |\ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
Make sure removed QTextBlock is invalid
Cocoa: Fixup wrong code in patch baaa5ae
|
| | | |\ \ \ \ \ \ \
| | | | | |_|_|_|/ /
| | | | |/| | | | | |
|
| | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: Fixup wrong code in patch baaa5ae
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Sort of imbarassing, but baaa5ae went in before I checked
that the old-behaviour-flag also worked. Which is didn't.
This patch will make things good.
Task-number: QTBUG-11481
Reviewed-by: jbache
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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:
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
HTTP cacheing: do not store the date header with the resource
Let's not write to the source buffer when blending argb32 on rgb16.
make -markuntranslated work without -idbased
fix conditional on shell type
|
| | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / / / |
|
| | | | |\ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
HTTP cacheing: do not store the date header with the resource
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Windows 7 sends WM_SIZE messages without preceding WM_SYSCOMMAND
when a window is maximized or restored via Aero Snap. These messages
are now handled correctly.
Merge-request: 1105
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
| | |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Fix typos in QSharedPointer documentation.
Remove test for compiler correctness
Refactor qpointer dereference tests
Prefer QCOMPARE to QVERIFY for comparisons.
Improve coverage of qpointer autotest
Add comments, eliminate duplication in qpointer autotest.
Remove redundant includes and functions from qpointer autotest.
Fix tst_XmlPatterns::xquerySupport() autotest
Update copyright year to 2011.
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
|
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Reviewed-by: Trust Me
|
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | / / / / / / / /
| | | | |_|/ / / / / / / /
| | | |/| | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | | | |_|_|/ / / / / /
| | | | |/| | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: p1 bug fix: fix auto test regressions
Cocoa: p1 bug fix: revert use of subWindowStacking
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Ref: 32228c4f2b3419a35d1623377050ef72edf73c92
It seems that the change above broke some auto tests, which
revealed a true problem. When it comes to modal dialog, children
still needs to be stacked on top of modal parents, as they the
user cannot use the mouse to raise it. So rather than removing
subWindowStacking fully, we narrow it even further down to
only be used for children of modal dialogs. All in all, this
is close to removing it, but still us it for certain corner cases.
Task-number: QTBUG-11481
Reviewed-by: msorvig
|
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
This reverts commit 3c2373d7ea9bc91bb537c0725984d19ad0fbab01.
After finding yet another bug related to cocoa child windows
(QTBUG-17738), we have no other option than to admit it was a wrong
move to use the API in the first place. Had we only known how many
side-effects and hidden bugs it would introduce. The original problem
we tried to solve were the cases where a stays-on-top parent window
executed a modal child dialog. This child should always stay on top of
its parent, but Cocoa would insist on pushing the window down to the modal
window level upon activating/deactivating the application. Some window
systems will always stack a window child on top of the parent, while
others (X11) seems to be more selective on this issue. On Mac, we already
stack windows a bit differently, thinking first and foremost on tool
windows.
Since this change is going into a patch release (which is debatable,
since this changes behaviour, but p1 is a p1), we choose to add in a
backdoor for those users who by chance depend on this behaviour. Setting
the env var QT_MAC_USE_CHILDWINDOWS=1 will give you the old code
path, but we plan to remove this for Qt-4.8.
Also, this patch does fix the original bug described above by overriding
the setLevel method in NSWindow, and refuse Cocoa to level down
stays-on-top modal windows.
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | | | | | | | | | | / /
| | | |_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|/ / / / /
| | | |/| | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
qdoc: Allowed multiple values for certain metadata tags.
qdoc: modified \include to take a 2nd arg, snippet id.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Also output mainters for classes in the HTML output,
if there are maintainers listed.
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|/
| | | | |/| | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QGradient stop with NaN position on Symbian.
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
QApplication does not define flag for "single touch"
Native dialog softkeys are covered by QApplication softkeys
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Dialog softkeys are covered by Qt Application's Softkeys
Updating softkeys while showing a native dialog, pushes Qt application CBA
on top of dialog CBA. Therefore, native dialog can not be dismissed.
As a workaround, when gaining focus to a window, do not update application
softkeys, if there is a native dialog shown.
Task-number: QTBUG-18486
Reviewed-by: mread
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | |_|/ / / / / /
| | | | |/| | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow
|