| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: provide more standard icons
Update QtOpenGL section in Symbian platform notes.
The qmlshadersplugin deployment must be scoped same as its building
Do not try to open VKB if it is already open in Symbian
Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Add custom standard icons for Symbian iconography. Additionally,
map few existing standard icon enums to new icons.
Task-number: QT-5116
Reviewed-by: Miikka Heikkinen
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-20216
Reviewed-by: Laszlo Agocs
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The check "contains(QT_CONFIG, opengl)" is used to include shaders
subdir, so the same check needs to be used when defining deployment
for shaders in s60installs.pro
Task-number: QTBUG-20192
Reviewed-by: TrustMe
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If QEvent::RequestSoftwareInputPanel was handled when there was already
an active virtual keyboard that had a child dialog open such as symbol
or writing language selection dialog, the VKB would be brought to
foreground on top of the child dialog, causing several problems, such
as options menu and letter keys no longer working in VKB.
Fixed by checking if VKB is already open before opening it again.
Task-number: QT-5133
Reviewed-by: Sami Merila
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*)
on OpenGL graphics system.
Task-number: QTBUG-15254
Reviewed-by: Laszlo Agocs
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Re-apply licenseheader text in source files for qt4.7
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Fixed license text in files having old license.
Reviewed-by: Trust Me
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QWidget::palettePropagation2() autotest on Symbian (part 2)
Fix QWidget::palettePropagation2() autotest on Symbian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add also include to QS60Style to avoid build failure.
Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Autotest fails since calling QApplication::setPalette() clears away
QPalette hash (class specific palette information). QS60Style tries
to re-set theme-specific hash after updating application palette with
real theme background, but does not take into account that application
might have defined own custom palette hash data.
As a fix, store the previously set palette hash information and restore
it after calling QApplication::setPalette(). Additionally, remove the
palette change event sending, since QApplication will post that event
anyway when palette is updated.
Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replaced std::cout with QTextStream
Reviewed-by: Eckhart Köppen
(cherry picked from commit f078275a2a4b2a279a6fcc24df3c21fe8b21f007)
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix text color in some cases of QML and QStaticText
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a
regression.
When writing systems are mixed and an underline is set on the font,
QPainter will set a pen with the current color and a new width on
itself before drawing the decoration. This would cause the recorder
in QStaticText to mark the pen as dirty, saving the current pen
color in all subsequent text items. The effect was e.g. that in QML
the cached color would override the current one, making it impossible
to change the color on the text without forcing a relayout somehow.
The right fix is to only mark the pen as dirty when its color actually
changes.
Task-number: QTBUG-20159
Reviewed-by: Jiang Jiang
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added qmlshadersplugin to Symbian s60installs.pro-file.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-18346
Reviewed-by: Sami Merila
|
| |\ \ \ \
| |/ / /
| | | /
| |_|/
|/| |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix KERN-EXEC 0 errors in symbian bearer plugin
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
The plugin was ignoring errors when opening a handle, and as a result
crashed if the handle was invalid.
Error checking / handle validity checks added.
Task-number: QTBUG-18572
Reviewed-by: mread
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Use numeric virtual keyboard for all number entry modes.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt::DialableCharactersOnly and Qt::ImhFormattedNumbersOnly now use
numeric mode virtual keyboard as they are supposed to. '*' and '#' keys
can be used to enter the non-digit characters allowed in these modes.
Task-number: QT-5085
Reviewed-by: Sami Merila
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QTBUG-17776, reporting terminated threads as not running on Symbian
Splitview - Auto-translation rules changed
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On Symbian app shutdown all threads are terminated and their stack
memory is released, but there is no time for notification of exit of
these threads. So any attempt to access stack data in such a thread
from static data destruction will cause a crash.
This was happening with the XmlQuery thread. It was testing if the
thread was still running, and QThread thought it was because there was
no notification. So when the XmlQuery thread was asked to exit, and
QThread::exit tried to access a stack based QEventLoop, there was a
crash.
By adding a test if the thread has been terminated to
QThread::isRunning(), clients can now rely on this to know that it is
safe to call exit() on a thread. The existing code is made safe again.
Task-number: QTBUG-17776
Reviewed-by: Shane Kearns
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When using "splitview" (virtual keyboard with non-fullscreen
editing mode), it is currently auto-translating the cursor to the
center of the screen if possible.
It would be preferable, if the translation would only be minimal,
just enough for cursor to be visible. This makes scrolling of
input widget (i.e. large editor) easier to use, as text flows
naturally (row-by-row) and not in "jumps" like it used to do.
Additionally, limit the translation to the end of input widget
boundary.
Task-number: QTBUG-20034
Reviewed-by: Miikka Heikkinen
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Support clipboard function on Symbian
Added qmlshadersplugin to Symbian qt.iby-file.
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-19996
Reviewed-by: Sami Merila
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-18346
Reviewed-by: Sami Merila
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (23 commits)
Workaround webkit deadlock on macos x
Disable antialiasing for tiled image drawing.
Ensure visibility of input widget in QML app when doing layout switch
Def update for gui, openvg, and opengl.
Revert "Def update."
Fix trailing whitespace
Remove unnecessary resizes during orientation change
Revert "Symbian: Fix QFontInfo::pixelSize()"
Improving warning messages in QVolatileImage.
Proper naming for raster pixmap and paintengine on Symbian.
Def update.
Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
Resizable graphicsview's background is drawn incorrectly in splitview
Add inputcontext reset to orientation switch in Symbian
QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
Symbian: Fix QFontInfo::pixelSize()
Drop-down menu position is altered when Partial VKB is invoked
Fix SVG icons on softkeys in new Symbian devices
Fix screen dimensions after orientation change in split screen mode.
Qmlshadersplugin examples added.
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.
Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.
Reviewed-by: Laszlo Agocs
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-19821
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When QML application changes orientation, it usually switches to a new
layout that lays out widgets differently (ie. in portrait, one vertical
column; in landscape, horizontal multi-column layout).
This easily breaks splitview translation logic, since it tries to ensure
the visibility of the input widget before the new layout has been
applied.
Additionally, the logic failed, when connected signal was fired, since
it assumed that the new translation would have translated the view above
from where it started from (i.e. window below the translated view would
have been exposed) and thus, it didn't do anything.
As a fix, when translation logic seems to indicate that the translation
would fail (and thus previously wouldn't do anything), reset the
existing translation and try again.
Task-number: QTBUG-16785
Reviewed-by: Miikka Heikkinen
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
This reverts commit cf429b48cf144a4f6fa1b7e96ed00f5ce3fe085b.
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Orientation change causes unnecessary resize to top
level window on Symbian. This causes recreation of
EGL surfaces which is not wanted.
Task-number: QTBUG-19911
Reviewed-by: Sami Merila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit fcfc19878a0a1a48194a786bba64da11606077d2.
I am happy that this commit fixed three bugs at once. But
Actually, I am not sure if QTBUG-15513 should be fixed at
this point. Fact is that the patch as it is would have changed
the point->pixels calculation back to how it was in Qt 4.6.
This means that the fonts which are defined with pointSize
would now (in Qt 4.7.4) suddenly be bigger than they were
in Qt 4.7.3. Imho this is unacceptable, as it would break
all layouts which were developed for Qt 4.7 apps, when
point size (instead of pixle size) was used.
I will need to fix QTBUG-17844 without fixing QTBUG-13009
If QTBUG-13009 will be fixed for 4.8 will be discussed.
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Jani Hautakangas
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
As QTBUG-19880 highlighted, the old S60 naming is not suitable for
these classes anymore.
Task-number: QTBUG-19913
Reviewed-by: Jani Hautakangas
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: TRUSTME
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When drawing such pixmaps (used by both the openvg and opengl graphics
systems) onto another pixmap or to a QImage, the performance was
sub-optimal due to missing and accidentally disabled support
specific to QVolatileImage. This is now fixed and drawing pixmaps into
a QImage is also made optimal by using the QS60PaintEngine for
QImage too. This will cause a 5-7x (or even up to 12x on certain
hardware and platform) increase in offscreen pixmap drawing
performance.
Task-number: QTBUG-19880
Reviewed-by: Jani Hautakangas
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Due to the fact that native side re-opens keyboard before sending
rotation event, the original size of graphicsview before auto-translate,
is stored incorrectly. We store the height of graphicsview in previous
orientation. Now, if the window was maximized, graphicsview was drawn
correctly, since closing vkb would change the window state back to
maximized and thus force a resizing of the view. With fullscreen gv
this didn't happen. Fullscreen graphicsview thus needs a forced
resize back to fullscreen.
Task-number: QTBUG-19856
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Switching orientation double-committed any preedit string in progress,
so added inputcontext reset to KEikDynamicLayoutVariantSwitch handling,
ensuring the string will get only committed once.
Task-number: QTBUG-19864
Reviewed-by: Sami Merila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
New Symbian root theme defines KAknsIIDQsnFrSetOpt as empty.
Drawing the frame through native API produces white box.
Since the frame is no longer used on the native side,
skip drawing it from style.
Task-number: QTBUG-19782
Reviewed-by: Tomi Vihria
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Unlike QFont::pixelSize(), which may return -1 if the font size was
defined in points, QFontInfo::pixelSize() always needs to return a
valid value.
c4ef479906f073fa84999eb950f00e264ebd4e8e which was a fix for
QTBUG-13009 tried to fix a similar issue, but failed to do that
properly, which resulted in QTBUG-15513 and QTBUG-17844.
This commit is supposed to fix all three bugs.
Task-Number: QTBUG-13009
Task-Number: QTBUG-15513
Task-Number: QTBUG-17844
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When a new window is shown and splitview is open, native side claims
that available screen area for the application is only the screen area
above keyboard. However, since opening a new window, will eventually
lead to keyboard getting closed, the new window will look strange
occupying only top part of the screen.
Fix it so that when a new window opens and splitview is open, window
will still get its extent set to fullscreen area (minus native panes,
if available).
Task-number: QT-5103
Reviewed-by: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
SVG icons automatically resize to the size of the pixmap, so the
size of the icon pixmap needs to be what the platform expects. Added
custom pixel metrics for CBA icon size that can be utilized for this
purpose.
Task-number: QT-5115
Reviewed-by: Sami Merila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The client area dimensions reported by native side only encompass
the screen not covered by virtual keyboard and ignore the status
pane. Fixed by recalculating proper client area in
handleClientAreaChange() using layout metrics.
Task-number: QT-5105
Reviewed-by: Sami Merila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Example application for OpenGL shading language and QML. Added also a link from qml examples main documents labs section.
Reviewed-by: Kim Gronholm
|
