| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QMessageBox theme background is incorrect
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use correct native theme graphic for dialog backgrounds. In the past,
native menu background graphic was used for dialogs and menus.
Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adding "hkscs_2004" to the codec alias table
Adding Kazakh entry to the codec alias table
On symbian QMessageBox icon is on different side than in native dialog
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Symbian dialogs have layout (on LeftToRight UIs)
where icon is on the right and text on left.
Whereas, Qt by default has icon on the left and text on the right.
Fix Qt dialogs to behave like native ones on Symbian.
Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix horizontal center alignment with trailing space
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Text drawn with horizontal center alignment (AlignHCenter) and
QTextOption::IncludeTrailingSpaces flag as off should consider
the trailing space width (leading space width for RTL lines),
because textAdvance here ignores the space. Disregard that space
width here in alignLine will make RTL lines aligned a bit to
the right.
In short, for something like this:
|w1|space|text|w2|
|<- totalWidth ->|
we want to have w1 + spaceWidth = w2 = (totalWidth - textWidth)/2,
so that the actual rendered text will appear at the center of the
bounding rect.
Task-number: QTBUG-18303
Reviewed-by: Eskil
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
StandardIcon enum comparison should be done with bitwise operation,
not with value.
Task-number: QTBUG-20240
Reviewed-by: Tomi Vihria
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
changelog
Compile with DEBUG_FONTENGINE define
minor optimization
remove the old compatibility code
make QFontEngineQPF1 work even without mmap(2) support
Doc: Fixing typo
|
| | | | |
| | | |
| | | |
| | | | |
Trivial fix to make the debug code compile again after latest changes
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
use the cached data from fileinfo rather than re-creating it one line later
Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
obsoleted by the last commit (and moreover, disabled a while ago)
Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this also fixes a memory leaking on Integrity
(an allocated data was unmap()'ed rather than free()'d)
Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Re-apply licenseheader text in source files for qt4.7
Fix QWidget::palettePropagation2() autotest on Symbian (part 2)
Fix QWidget::palettePropagation2() autotest on Symbian
QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
Fix text color in some cases of QML and QStaticText
Added qmlshadersplugin to Symbian s60installs.pro-file.
Fix KERN-EXEC 0 errors in symbian bearer plugin
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
Conflicts:
src/s60installs/s60installs.pro
|
| | | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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-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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
From before, the filename filters set on the dialog were matched
against the full patch of the filenames shown in the dialog. The
correct way is to only match it against the filename. This becomes
evident if you set a filter that has no wild cards, e.g "qmake"
Rev-By: jbache
|
| |\ \ \ \ \
| |/ / / / |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix vertical positioning of glyphs in raster engine with FreeType
Ensure a small event check interval on uikit platform.
Change default application font for uikit platform.
Use the QPoint memory layout change only on Desktop Mac
Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
Add IPHONEOS deployment vars to makespec
Post key events via QWindowSystemInterface, don't post events direcly
Use nicer fonts and a few little patches to uikit platform.
Update README and qmlapplicationviewer to suit 4.8.
Updated proof-of-concept UIKit mkspecs
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: aavit
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Re-apply licenseheader text in source files for qt4.8
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
New files after previous license change round.
Reviewed-by: Trust Me
|
| | |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | /
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Reorder variable to eliminate warnings
Only compare styleNames if they are not empty
Add styleName to QFontDef comparison
|
| | | |\ \ \ \
| | | |/ / / |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Frederik Gladhorn
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-19366
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
To make sure we cache different font engines with different style
names.
Task-number: QTBUG-19366
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Make it compile with openssl 1.0.0d, gcc 4.6
QStringBuilder: do not crash with null char*
Fix event delevery order
QSocketNotifier autotest - fix compile with MSVC
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Some functions (such as QObject::moveToThread) did not keep
the event ordered by priority.
And because qUpperBound is used to add events, that mean new
events would not be inserted in order.
Task-number: QTBUG19637
Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8
Reviewed-on: http://codereview.qt.nokia.com/733
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 7eeabcf70db658bca847498f618a94a375c95f5f)
|
| | |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
When asking for relations, don't crash on children that don't return an interface.
Remove more inconsistencies with invisible.
QAccessibleToolButton::text should return accessibleName if set.
Remove stray semicolon.
Do not expose text when echo mode is not Normal.
Check validator when changing text using accessibility functions.
Fix some issues introduced in df6713b8f55fc007796f40.
Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX.
Avoid bogus accessibility focus events from menus.
Build fix for Mac OS 10.5
Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden
Notify a11y framework of FocusChanges for QGraphicsObject
Call updateAccessibility on the QGraphicsObject in updateMicroFocus
Fix updateAccessibility for QGraphicsObjects
Make accessibility work on Windows with alien
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits)
Use numeric virtual keyboard for all number entry modes.
QTBUG-17776, reporting terminated threads as not running on Symbian
Splitview - Auto-translation rules changed
Support clipboard function on Symbian
Added qmlshadersplugin to Symbian qt.iby-file.
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
...
|
| | | |\ \ \ \ \
| | | |_|/ / /
| | |/| | / /
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-19996
Reviewed-by: Sami Merila
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
