| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Jørgen Lind
|
|
|
|
| |
Reviewed-by: Jørgen Lind
|
|
|
|
|
|
|
| |
qt_button_down needs to be reset to 0 if it
points to the widget being deleted.
Reviewed-by: Samuel
|
|
|
|
|
| |
Implement some missing functionality in QWidget::destroy().
(cherry picked from commit 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black
Condensed" can't be selected in Qt because either they don't
report correct numeric values for weight/stretch/etc. or these
values are not mapped from QFont enums in a linear way. Thus
we provide a shortcut to select these fonts with PostScript
name or full name without resorting to family name matching in
QFontDatabase (these fonts are not registered in font database
anyway). After this, we can simply use:
QFont font("Helvetica Neue");
font.setStyleName("UltraLight");
to select these fonts. QCoreTextFontEngineMulti matched like
this can be created directly from the CTFontRef instance
instead of creating from the font name, making this process
faster.
The commit also cleaned up the font loading process in Mac
font database a bit, moving the code for family matching into
a separate function.
Add QFontInfo::styleName() and QRawFont::styleName() to access
the resolved style name for a font.
Task-number: QTBUG-19366
Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506
Reviewed-on: http://codereview.qt.nokia.com/333
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
(cherry picked from commit 97391be5ebddc62545ddb88f92fc2045bfa10711)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QTextDocument exports HTML, it makes an effort to be compatible
with its own importer, hence it has to be compatible with the dialect
of HTML which Qt has developed over the years. One incorrect
interpretation in Qt is that an empty paragraph is interpreted as an
empty line. So if you use a QTextDocument to produce HTML for text where
an empty line has been added, this empty line will not be visible when
the document is viewed in a compliant browser. The fix is to set the
height of the empty paragraph to 1em, so that it will match the current
pixel size of the font, thus look the same as a <p><br /></p> but
without altering the structure of the document.
Reviewed-by: Gunnar
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fix autotest on Windows
Compile on Mac OS X
Ammend last commit
Implemented QAccessibleTextEdit::attributes()
Changing cursor position in all boundaries
code clean-up for QSystemSemaphore
simplify QSharedMemoryPrivate::cleanHandle()
minor improvements for QSharedMemory
fix potential keyfile leaking
refactoring of the QWSSharedMemory class
allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h
minor typo fix
minor code simplification
minor code simplification
avoid the QT_NO_ASCII warning
remove an unused headers
nano optimization
don't reallocate memory if the old buffer has sufficient capacity
fix potential memory leaking
don't delete the lock if it was not created by this surface
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
drop old/unused API and obsolete code;
improve attach() for comon case;
cache the shm size at the first call;
fix the includes;
better debug strings;
minor code clean-ups
Merge-request: 1247
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
there is no need in non-const object as we don't change it anyways
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
`ascii` wasn't used
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
these headers weren't used anymore since QLock, QWSLock
and QWSSharedMemory classes had been introduced
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
allocate uninitialized QByteArray as it will be initialized few lines later
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the `memsize` member was never set with anything but 0;
so, the memory newer was freed neither in destructor, neither in releaseSurface().
for the first one it was non-critical because of the memory was freed indirectly
- by hiding widget before closing (which is why the issue wasn't catched-up until now)
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
and don't forget about it otherwise
Merge-request: 2627
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2627
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: (54 commits)
Update internal state before emitting configurationChanged() signals.
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
Fixed qmlshadersplugin on windows VC2008 toolchain.
Reset input context in Symbian when another window is opened.
KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
Close context menus during orientation change.
Have -small-screen enabled in certain examples on Symbian always.
Update Japanese translations.
Revert some of "Make QMLViewer startup animation stop after a while"
Fix for winscw QtGui.def
Add private method for flushing the pixmap cache.
QDeclarative: Fix QPerformanceTimer on Symbian
Fix QTreeWidget autotest cases on Symbian/VGA
Increase SSL readbuffer 1 -> 16 kB
Fix pixel metrics for Symbian VGA devices
Revert "Fix QNetworkConfigurationManager usage outside main thread first"
Avoid buffer overrun in QMacPixmapData resizing
Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
Fix tst_QGraphicsItem::sorting() test case for Symbian
Fix QHeaderView test case for VGA Symbian devices.
...
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/styles/qs60style.cpp
|
| | |\ \ \ |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Reset input context in Symbian when another window is opened.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When symbol menu is opened, input context needs to be reset or
preedit string duplication may occur after symbol menu is closed.
Task-number: QTBUG-19528
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \
| | | |/ / / / |
|
| | | |\ \ \ \
| | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
There is no check if graphics view pointer is null in the SLOT
function translateInputWidget().
Task-number: QTBUG-19734
Reviewed-by: Miikka Heikkinen
|
| | | |\ \ \ \
| | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Close context menus during orientation change.
Have -small-screen enabled in certain examples on Symbian always.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make non-native QMenus, i.e. context menus, work like in Avkon.
Reviewed-by: Miikka Heikkinen
Reviewed-by: Sami Merila
Task-number: QTBUG-19656
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/bwins/QtGuiu.def
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid buffer overrun in QMacPixmapData resizing
Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
Missing glyphs transforming QStaticText on X11/raster with subpixel AA
Fixed clipping errors for non-extended paint engines.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Shouldn't use size bigger than the original (source) pixels buffer
or the new one (just allocated).
Task-number: QTBUG-18547
Reviewed-by: aavit
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is a back-port of part of cad70d64d0bbada. In the raster engine's
drawCachedGlyphs(), which is used by QStaticText, we would use the wrong
metrics to lay out the glyphs, because loadGlyphMetrics() would assume
full hinting. A visible effect of this was that the baseline of rotated
text became wavy.
Task-number: QTBUG-18185
Reviewed-by: Jiang Jiang
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Static text took an untested and broken code path for the combo of
subpixel AA, X11, raster engine and transformation. This would cause
missing glyphs. The reason was that QStaticText took an unused code path
which turned out not to work. The workaround is to use gray AA on
transformed text, like we already do for the GL engine. In Qt 4.8, the
static text code path has been rewritten to use the Freetype cache
instead of the image glyph cache, so the bug will be fixed more properly
there.
Reviewed-by: Samuel
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Partially revert change a33ef62469fd71bec for the non-extended paint
engine path.
Task-number: QTBUG-19525
Reviewed-by: Andy Shaw
|
| | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | | |
|
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/declarative/declarative.pro
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
|
| | | |\ \ \ \ \
| | | | | |_|/ /
| | | | |/| | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Increase SSL readbuffer 1 -> 16 kB
Fix pixel metrics for Symbian VGA devices
Revert "Fix QNetworkConfigurationManager usage outside main thread first"
Fix tst_QGraphicsItem::sorting() test case for Symbian
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Pixel metrics for focus frame (PM_FocusFrameVMargin and
PM_FocusFrameHMargin) had invalid values for VGA screens. Additionally
these same pixel metrics were adjusted for nHD.
Now, all but one QTreeView test cases pass for either screensize.
Task-number: QT-5056
Reviewed-by: Tomi Vihria
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QHeaderView test case for VGA Symbian devices.
Fix for BCM2727 chip detection on Symbian
Fix QMenuBar autotest failures for Symbian
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QSymbianGraphcisSystemEx::hasBCM2727() uses
bool QApplicationPrivate::useTranslucentEGLSurfaces to decide if
Symbian is running on BCM2727 chip which is not entirely correct.
bool QApplicationPrivate::useTranslucentEGLSurfaces should be
assigned according to QSymbianGraphcisSystemEx::hasBCM2727()
and QSymbianGraphcisSystemEx::hasBCM2727() should be
also static function.
Task-number: QTBUG-19578
Reviewed-by: Laszlo Agocs
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Effectively three fixes to reach same autotest results as on other
Symbian devices and to make the case not crash (itself, or Qt).
a) Fix null pointer usage in QWidget.
This is mostly theoretic case, since it requires that previous focus
widget has widget, yet it doesn't have internal winId. Still test case
manages to make this happen, so lets prevent the null pointer use.
b) Skip activatedCount_noQt3() test case,
since it would require shortcut support and leads to test crash.
Qt for Symbian should have shortcut support as a result of task
http://bugreports.qt.nokia.com/browse/QTBUG-5730
c) Ensure that menu has at least 360 width in tests that send keypresses
to the menu. Otherwise, menuitems might get set into menu extension,
which makes highlight tests fail (since item is not visible).
Task-number: QT-5053
Reviewed-by: Tomi Vihria
|
| | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QToolButton autotest trigger() fails in E6
Documented Symbian peculiarity about QDesktopWidget::availableGeometry
Fix non-Symbian builds broken by previous commit.
Fix SYMBIAN_VERSION_* ifdeffing
Predictive text is not committed when writing in a QLineEdit
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In Symbian QDesktopWidget::availableGeometry() is not guaranteed to
return correct values at the time the resize event related to the
geometry change is passed to the widgets. There is a similar issue
with QDesktopWidget::screenGeometry(). Documented this fact.
Task-number: QTBUG-14058
Reviewed-by: Sami Merila
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QT-5065
Reviewed-by: Sami Merila
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QFileDialog and QSoftkeyManager broke in S60 5.3 platform because
incorrect version ifdeffing.
Task-number: QT-5065
Reviewed-by: Sami Merila
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QCoeFepInputContext is very aggressive committing its preedit string.
When AVKON FEP opens any of its subwindows, it steals the focus from
editable widget, which causes preedit string to get committed.
This makes the input context almost unusable with T9 word prediction.
As it is rather difficult to prevent focus loss in these types of use
scenarios, replace the committed string with user selected word when
suggested word list is closed.
Task-number: QTBUG-15031
Reviewed-by: Miikka Heikkinen
|
| | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | / /
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed more CI-errors caused by qmlshadersplugin addition.
Fixed CI-errors caused by qmlshadersplugin addition.
Fixing Linux compatibility issues for Symbian
Update the detection of is_using_gnupoc for S3.
Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1
Revert "Fixing Linux compatibility issues for Symbian"
sockets: limit buffer size of the internal sockets in proxy engines
|