| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added clean abort, dryrun mode. And stop ignoring the unused byte in RGB32
Fix black- and whitelisting of individual items
Filter runs on git branch and repo
New and much improved mapping of items to fs storage
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some optimizations for the gray-raster (raster engine antialiasing).
Fix fontconfig pattern merging
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some optimizations for the gray-raster (raster engine antialiasing).
Fix fontconfig pattern merging
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Increase the size of the initial memory pool (it's anyways free'd later
on) to improve the performance of the rasterizer and also decrease the
chance of re-allocations.
Also, by combining gray_record_cell and gray_find_cell into one
function, as gray_find_cell is only called from the former, we can skip
some unnecessary operations.
Measured performance improvements range from 58 % to 154 % for rounded
rect filling and stroking.
Reviewed-by: Andreas Kling
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When merging fontconfig patterns, we need to clean up existing object
first, otherwise the added object will be appended instead of replacing
the existing object. When multiple font engines are using shaping, if
fontconfig patterns are not correctly merged, it will result using the
old font. For instance, in "<b>Fake Bold</b> Normal", "Normal" text will
continue using the font for "Fake Bold" (that only happen with fallback
fonts).
Task-number: QTBUG-14455
Reviewed-by: Eskil
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
Unified the usage of $${EPOCROOT} for symbian.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion.
Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf.
RevBy: Miikka Heikkinen
|
| |/ / /
| | |
| | |
| | | |
RevBy: Miikka Heikkinen
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix bidi PDF mark support in Core Text shaper
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix bidi PDF mark support in Core Text shaper
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When Core Text shaping a string like LRE ... PDF, it won't leave
a zero width glyph for the PDF mark, it is not consistent with
HarfBuzz and will cause issues in our text engine (the last glyph
of the string will be considered as a ligature). This hack
appended such a zero width glyph to fix that.
Reviewed-by: Eskil
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Improve restoring of miximized window geomertry."
Use WS_POPUP window style more often on windows.
Add version information for imported JS benchmarks
Improve restoring of miximized window geomertry.
Fix wrong error assumption when converting "0.0" to double
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit abba37cd0eff959edf2d011842cbf2b36cce8467.
Test Failure: tst_qwidget::restoreVersion1Geometry (linux-g++-32)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We dont use the WS_POPUP style when one of the following window flags
are set (WindowSystemMenuHint, WindowTitleHint, WindowMinMaxButtonsHint
WindowCloseButtonHint, WindowContextHelpButtonHint). None of these flags
can conflict with this style, hence being removed.
Task-number: QTBUG-10589
Reviewed-by: Denis
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
The benchmarks are subject to change, so it's nice to know
which versions are in the Qt repository.
|
| | |\ \ \
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Improve restoring of miximized window geomertry.
Fix wrong error assumption when converting "0.0" to double
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-2064
Follow-up commit to 54865d47cfd, which caused
a regression on multi-display systems on Windows.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The function qstrtod calls strtod without first resetting the errno
but verifying it nonetheless. This could lead to situations where
the errno was already set to ERANGE and hence it would mistakenly
assume the conversion could not be done right.
Merge-request: 2507
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid the flushing of widgets that shouldn't show on screen.
Change in QGraphicsView documentation.
Chip demo: makes scene interaction easier.
Fix cursor position of one digit after RTL text
Compile fix.
Introduced new class QAnimationDriver for plugging in what drives animations
Use correct font for menu item shortcuts
Fix text rendering offset for raster engine on Mac
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is mostly fixing errors appearing on the
command-line when using native dialogs.
Task-number: QTBUG-15169
Reviewed-by: Samuel Rødal
|
| | | |
| | |
| | |
| | | |
Reviewed-by: bnilsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It is now possible to zoom in or out using the mouse wheel (while
pressing the CTRL key). It is also possible to switch between two pointer
modes: select and drag. The first one allows to select items and move
them, the second allows to drag the scene.
Reviewed-by: bnilsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A single digit after RTL text will be considered as RTL because it
was treated as Other Neutral (DirON), it can be solved by changing
it to DirAN.
Task-number: QTBUG-2795
Reviewed-by: Lars Knoll
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Gunnar
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Introduced new class QAnimationDriver for plugging in what drives animations
Use correct font for menu item shortcuts
Fix text rendering offset for raster engine on Mac
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need such a concept in place in order to do animations that are driven
by vertical sync rather than QTimer, as vertical sync comes constantly at
16.66 ms. This means that animations do will not be jerking...
Reviewed-by: bnilsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We used to use kThemeMenuItemCmdKeyFont for drawing menu item
shortcuts, however, Apple is using the same font for both menu
item text and shortcuts, it's likely that kThemeMenuItemCmdKeyFont
is no longer valid. Change it to kThemeMenuItemFont will make the
font for shortcuts consistent with other Mac applications.
Task-number: QTBUG-15230
Reviewed-by: Fabien Freling
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since the bounding box returned by Core Text in smaller than the
actual glyph rendered, we have 2 pixels padding around it, as a
result, we have to leave 1 pixel above the glyph in glyph cache,
so we need to put the text origin 1 pixel lower to draw it.
Task-number: QTBUG-15223, QTBUG-15230, QTBUG-15243
Reviewed-by: Gunnar Sletta
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: (243 commits)
Fix compilation after merge.
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
Doc: Fixing typo
Coding style: bang cleanup.
Removed call to glFinish, obsoleted by fence syncs.
Helper-side support for QMeeGoFenceSync.
Plugin-side support for creating/destroying/waiting on fence sync.
Added MeeGo graphicssystem entry points for KHR_fence_sync.
Trailing whitespace fixes.
remove pointless assignment of deprecated variable
QDeclarativeDebug: Keep source information when changing an expression
Fix auto-test regression in tst_QDoubleValidator
Fixed tst_qpixmap::grabWidget autotest failure on QWS.
Use $${EPOCROOT} variable rather than absolute paths in .pro files
fix tst_headers
Fixed a shell syntax error in configure
Flickable does not reposition its content when it is resized.
Document that Transitions are exclusive.
...
|
| | | |
| | |
| | |
| | | |
Also fix a warning
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Doc: Fixing typo
Fix auto-test regression in tst_QDoubleValidator
QS60Style: Color calculation should be optimized
QS60Style: Color calculation should be optimized
With some locales, QDoubleValidator would not accept "C" locale valid numbers
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The locale from a previous test was not cleared.
Another issue has been detected, though, and reported as QTBUG-15210.
Reviewed-by: Thierry
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Addendum to the previous fix. Remove trailing white space as well.
Task-number: QTBUG-14860
Reviewed-by: Jani Hautakangas
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Currently, QS60Style calculates some palette colors (tooltip base and
button). Since native side does not have a color for these, but a
nine-part theme graphic, the style tries to estimate the color of the
bitmap by taking a small sample of the QPixmap and calculate the
RGB colors of 32*32 pixels. This is rather slow, it takes around
110 msecs for each QApplication, when the application is started.
Note that color is cached to member variable of style, but it is very
rarely asked again (as the color is polished to all widgets/apps)
and the cache is not shared across processes.
As a fix, style now calculates the button color (tooltip color
is no longer calculated, as no other QStyle does that, and
tooltips do not anyway work in the Qt/Symbian) and stores the
calculated value to Global QSettings together with active theme
ID. Now, when a second Qt application is launched, the stored
theme ID value is matched with currently active theme. If it
matches, then the stored Button color is used. Otherwise, color
is again calculated and stored. If theme is unchanged, the
application launch is ~95msecs faster.
Task-number: QTBUG-14860
Reviewed-by: Jani Hautakangas
|
| | | |\ \ \ |
|
| | | |\ \ \ \ |
|
| | | |\ \ \ \ \ |
|
| | | |\ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Locales using dot as thousands delimiter and comma as decimal
separator are prone to this error.
This is a regression introduced by commit b81b8e43ad57183ed66.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG_14935
|
| | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
They were in wrong section of the file due to editing error and
therefore ignored.
Reviewed-by: Markus Goetz
|
