| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| | |
doc-4.7
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't double call classBegin()
Notify QML internal notifiers of item geometry changes before QML signal handlers.
Revert "Add 'cached' property to Image."
Add 'cached' property to Image.
Ensure Flickable visibleArea is updated when view height changes
Improve calling QML functions from C++ docs.
Add missing license headers
Remove debug.
Snake: Don't use Behavior with states.
QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu
Fix application exiting in embedded qml examples
QDeclarativeDebug: Destroy incoming connections if already connected
Simplify type management code
QML JavaScript .import parser
Fix VisualDataModel model update handling when rootIndex is specified.
Improve test reliability when running in parallel with other tests.
Improve stability of test on loaded hw.
Improve stability of test on loaded hw.
|
| | | |\ |
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
handlers.
Task-number: QTBUG-12303
Reviewed-by: Aaron Kennedy
|
| | | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-13114
|
| | | |\ \ \
| | | | |/
| | | |/| |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This will have to go in 4.8.
This reverts commit 3928cb20ecc63ed21cdb122388b200c9ab8e7cad.
|
| | | | |/
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-7300
Reviewed-by: Aaron Kennedy
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13095
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number:
Reviewed-by: Martin Jones
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove debug.
Snake: Don't use Behavior with states.
QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu
Fix application exiting in embedded qml examples
QDeclarativeDebug: Destroy incoming connections if already connected
Fix VisualDataModel model update handling when rootIndex is specified.
Improve test reliability when running in parallel with other tests.
Improve stability of test on loaded hw.
Improve stability of test on loaded hw.
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove debug.
Snake: Don't use Behavior with states.
QML Viewer should be put under QtDemos instead of QtExamples folder in Symbian app menu
Fix application exiting in embedded qml examples
QDeclarativeDebug: Destroy incoming connections if already connected
Fix VisualDataModel model update handling when rootIndex is specified.
Improve test reliability when running in parallel with other tests.
Improve stability of test on loaded hw.
Improve stability of test on loaded hw.
|
| | | | | | | |
|
| | | | | | |\ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Symbian app menu
Task-number:
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-13178
Reviewed-by: Martin Jones
|
| | | | | | |/
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Changing states mid-animation confuses states where property value
is not specified explicitly for each state.
Task-number: QT-3823
|
| | | | | | |\ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Without this, QML Inspector in Qt Creator gets no error message for
failed connections, which can lead to confusion.
Reviewed-by: ogoffart
|
| | | | | | |\ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-13038
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | |_|_|_|/
| | |/| | | | |
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix #pragma message(), the message must be enclosed in parentheses
preserve non-standard source references
QSslConfiguration: fix crash when accessing null pointer
properly parse ts contexts in obsolete messages
move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
Fix static build on Windows with MinGW.
Reenable the reporting of CPU features.
make qdoc3 boot-strappable again
fix MinGW cross compilation with -debug-and-release
Updated and new Slovenian translations for Qt 4.7
Designer: Fix crash on unsupported Language/Country combination.
Doc: Fixed qdoc warnings and generalized the date and time descriptions.
Doc: Whitespace fixes.
Doc: Fixed snippets in QML introduction broken in an earlier commit.
doc: Fixed numerous qdoc warnings.
|
| | | |\ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix #pragma message(), the message must be enclosed in parentheses
preserve non-standard source references
QSslConfiguration: fix crash when accessing null pointer
properly parse ts contexts in obsolete messages
move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
Fix static build on Windows with MinGW.
Reenable the reporting of CPU features.
make qdoc3 boot-strappable again
fix MinGW cross compilation with -debug-and-release
Updated and new Slovenian translations for Qt 4.7
Designer: Fix crash on unsupported Language/Country combination.
Doc: Fixed qdoc warnings and generalized the date and time descriptions.
Doc: Whitespace fixes.
Doc: Fixed snippets in QML introduction broken in an earlier commit.
doc: Fixed numerous qdoc warnings.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 796
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
the PO format doc suggests that all references are in
filename:linennumber format, but some tools seem to deviate from that.
so do our best to preserve such references, even if we can't do anything
with them.
Task-number: QTBUG-9488
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We were accessing the d-pointer of a QSslConfiguration which is
initialized lazily.
Reviewed-by: Markus Goetz
Task-number: QTBUG-13265
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
after all, it is pretty much specific to xlf files, even if the problem
majorly concerns converted po files.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for
static code.
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The linking error before was most likely namespace issue
|
| | | | | | | | |
|
| | |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Text is inputted on top of existing text in anomaly
QLineEdit cursor is shown when asked to be non-visible
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Switch Anomaly demo app to use QLineEdit::setPlaceHolderText instead
of using own internal paint event handling for Address bar widget.
Task-number: QT-3657
Reviewed-by: Miikka Heikkinen
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
If QLineEdit is sent a QInputMethodEvent::Cursor event with value zero,
widget still shows blinking cursor. This is due to that QLineControl
ignores its internal state variable m_hideCursor value.
As a fix, m_hideCursor is now considered when drawing the cursor.
Additionally, the cursor blinking timer is stopped when cursor is
hidden.
Task-number: QT-3670
Reviewed-by: axis
|
| | |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (377 commits)
Correct last right bearing in boundingBox(glyphs)
Make sure propagated font in QGraphicsWidget can be set on a QPainter
Apparently QPen::brush() can't return a NoBrush for a NoPen.
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Commit 07880542ecc479807c23c5646d263135240822ff introduced regression to
QFontMetrics::boundingRect and QTextEngine::boundingBox on FT, XLFD and
QPF font engine. Because on these platforms, rightBearing of the last
glyphs is already removed from the width returned in glyph_metrics_t.
Subtracting that rightBearing twice will cause the resulting boundingBox
smaller than expected.
This patch fix this by removing last right bearing accounting code from
generic QTextEngine::boundingBox, instead, we put it into font engines
that need them: QFontEngineWin, QCoreTextFontEngine, QFontEngineMac,
QFontEngineS60 and QFontEngineQWS. So that the resulting width should be
correct on all platforms without introducing any performance penalties.
Task-number: QTBUG-6854, QTBUG-12950
Reviewed-by: Eskil
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In QWidget and QGraphicsWidget, propagating fonts blank out the resolve
mask, mainly to help in determining inheritance. This means that when
the font is set on a QPainter with device and therefore resolved against
the device font, none of the attributes in the font will take presedence
and the font will essentially just be ignored. For QWidgets this has not
been a problem due to the fact that the painter is opened on the widget,
getting the propagated font as its device font. For QGraphicsWidget,
however, the QPainter is opened on the viewport and the viewport's font
will therefore override the propagated font when it's passed into
setFont(). To fix this, we need the font returned by
QGraphicsWidget::font() to contain the resolve mask of the inherited
parts of its font as well. This is done last minute to avoid messing
up the rules of inheritance in the QGraphicsWidget tree (problem arises
e.g. in hierarchy A -> B -> C and a font is set on B which should override
the font C has previously inherited from A.)
Task-number: QTBUG-13188
Reviewed-by: Lars
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
There are explicit tests in qdatastream for this. IMO it's wrong,
wrong, wrong, but it's currently abused in the SVG module so we can't
change it.
Reviewed-by: Gunnar
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (374 commits)
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: add link to new gettings started to index.html
Doc: Fixing bug involving header misplacement in Creator style
...
|
| | | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (374 commits)
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
use QFile:map instead of ::mmap
Do not use global static const references to objects
Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
Refactor blend_transformed_bilinear to simplify the blend type checking
Note RTL behavior changes in docs and changelog
Implement qt_memfill32 with Neon.
Implement the composition mode Plus with Neon.
Fix the broken unicode detection of ODBC driver.
Doc: Fixed qdoc warnings.
Doc: updating getting started docs - not finished
Make it possible again to build Qt without webkit
Doc: fixing creator bugs, removing menus and textbox in the header
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Doc: Fixing overlapping text in header list
Use Ctrl rather than Alt for switching tabs in the demo browser
Doc: add link to new gettings started to index.html
Doc: Fixing bug involving header misplacement in Creator style
...
|
| | | | | | | | | | | |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
This could cause some strange things to happen in our fallback code
used for e.g. printing, since the brush might be valid and e.g. contain
alpha values etc.
Task-number: QTBUG-12263
Reviewed-by: Gunnar
|
