| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
| |
We look though SOURCES for Objective-C/C++ source files and if we find
any we warn the user and move the offending file to OBJECTIVE_SOURCES.
We also don't generate implicit rules for .mm files anymore, since
that's not supported by qmake and will break in mysterious ways.
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
|
| |
|
|
| |
Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
|
| |
|
|
| |
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
| |
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
| |
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
| |
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
| |
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
| |
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
|
|
|
|
|
|
| |
This fixes the issue of showing drive D: when completion is used
in QFileDialog to display suggestions for folders to change into
in path C:/.
Task-number: QTBUG-14072
Reviewed-by: Olivier Goffart
|
| |
|
|
|
|
|
| |
This bug was introduced with
fa46fa236b5f4a9a5677da2e7464a6b9f8b7b5f3
Reviewed-by: Joao
|
| |\
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.
Designer: Enable morphing into QTextBrowser.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
When constructing QGraphicsSceneHoverLeave event out of QEvent::Leave
we should set the widget pointer to the graphicsview's viewport, th
same as we do for other graphicsscene events like QGraphicsSceneMouseEvent.
Reviewed-by: Yoann Lopes
Reviewed-by: Bjørn Erik Nilsen
|
| | |
| |
| |
| | |
Task-number: QTBUG-14537
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: (48 commits)
Fix CI by recreating reference bitmaps for text comparison
tst_qdeclarativetext: Regenerate the baselines after the merge.
Giving Qt a default app server when Avkon is removed
TextInput autoscroll now scrolls when the cursor moves
Fix samegame tutorial js
Make minehunt less cheerful
Add new behavior example.
Fix autotest on windows
Added --remove-destination to qmake_emulator_deployment.flm
Fix worker ListModels to property emit countChanged()
Update color type docs to mention transparency
Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
Fix alignment bugs in Text element
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Compile on WinCE
Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph
Optimize QFontEngineS60::recalcAdvances()
Delete qtdemoapps.iby.
Added bearer plugin deployment to qt.iby
Implement QFontEngineS60::emSquareSize()
...
|
| | | | |
|
| | |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: (47 commits)
tst_qdeclarativetext: Regenerate the baselines after the merge.
Giving Qt a default app server when Avkon is removed
TextInput autoscroll now scrolls when the cursor moves
Fix samegame tutorial js
Make minehunt less cheerful
Add new behavior example.
Fix autotest on windows
Added --remove-destination to qmake_emulator_deployment.flm
Fix worker ListModels to property emit countChanged()
Update color type docs to mention transparency
Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
Fix alignment bugs in Text element
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Compile on WinCE
Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph
Optimize QFontEngineS60::recalcAdvances()
Delete qtdemoapps.iby.
Added bearer plugin deployment to qt.iby
Implement QFontEngineS60::emSquareSize()
Remove unnecessary calls to GetHorizBounds() + boundingBox()
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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: (47 commits)
tst_qdeclarativetext: Regenerate the baselines after the merge.
Giving Qt a default app server when Avkon is removed
TextInput autoscroll now scrolls when the cursor moves
Fix samegame tutorial js
Make minehunt less cheerful
Add new behavior example.
Fix autotest on windows
Added --remove-destination to qmake_emulator_deployment.flm
Fix worker ListModels to property emit countChanged()
Update color type docs to mention transparency
Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
Fix alignment bugs in Text element
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Compile on WinCE
Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph
Optimize QFontEngineS60::recalcAdvances()
Delete qtdemoapps.iby.
Added bearer plugin deployment to qt.iby
Implement QFontEngineS60::emSquareSize()
Remove unnecessary calls to GetHorizBounds() + boundingBox()
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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: (47 commits)
tst_qdeclarativetext: Regenerate the baselines after the merge.
Giving Qt a default app server when Avkon is removed
TextInput autoscroll now scrolls when the cursor moves
Fix samegame tutorial js
Make minehunt less cheerful
Add new behavior example.
Fix autotest on windows
Added --remove-destination to qmake_emulator_deployment.flm
Fix worker ListModels to property emit countChanged()
Update color type docs to mention transparency
Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
Fix alignment bugs in Text element
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Compile on WinCE
Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph
Optimize QFontEngineS60::recalcAdvances()
Delete qtdemoapps.iby.
Added bearer plugin deployment to qt.iby
Implement QFontEngineS60::emSquareSize()
Remove unnecessary calls to GetHorizBounds() + boundingBox()
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
This need to be checked.
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
tests/auto/declarative/qdeclarativetext/data/alignments_cb.png
tests/auto/declarative/qdeclarativetext/data/alignments_cc.png
tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Giving Qt a default app server when Avkon is removed
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Avkon provides a default app server when an app is started as a server
app. This allows any app to be started as a server app.
The Qt Avkon removal bypassed this, calling the base-class function
instead, which prevented apps from starting as server app unless they
explictly created a server.
Now Qt also creates a default app server, which implements no services,
so that any app can be started as a server app, even if Avkon is not
present. This allows Symbian^4, configured with -no-s60, to boot.
Task-number: QTBUG-14457
Reviewed-by: Jason Barron
|
| | | | | |\ \ \
| | | | | |/ /
| | | | |/| |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
TextInput autoscroll now scrolls when the cursor moves
Fix samegame tutorial js
Make minehunt less cheerful
Add new behavior example.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Previously needed some actual text changes to scroll, which is incorrect
Task-number: QTBUG-14230
|
| | | | | | |\ \ |
|
| | | | | | |/ /
| | | | |/| | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Turns out that subtraction is not commutative. Who knew?
Task-number: QTBUG-13532
|
| | | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
An instance of failure being improperly shown as victory was rectified.
Task-number: QT-3956
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits)
Fix autotest on windows
Fix worker ListModels to property emit countChanged()
Update color type docs to mention transparency
Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting
Fix alignment bugs in Text element
Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
Compile on WinCE
Update QtDeclarative def files
Update QtCore def files
Compile on MSVC2008
Bug: TextEdit ignores plain text format when pasting text
Update sections if model content changes.
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
...
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QT-4094
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
in Text painting
Task-number: QTBUG-14374
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-14374
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QT-4093
|
| | | | | | |\ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits)
Compile on WinCE
Update QtDeclarative def files
Update QtCore def files
Compile on MSVC2008
Bug: TextEdit ignores plain text format when pasting text
Update sections if model content changes.
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
...
|
| | | | | | | | | |
|
| | | | | | | |\ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits)
Update QtDeclarative def files
Update QtCore def files
Compile on MSVC2008
Bug: TextEdit ignores plain text format when pasting text
Update sections if model content changes.
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
...
|
| | | | | | | | |\ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits)
Update QtDeclarative def files
Update QtCore def files
Compile on MSVC2008
Bug: TextEdit ignores plain text format when pasting text
Update sections if model content changes.
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
...
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | |\ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (23 commits)
Compile on MSVC2008
Bug: TextEdit ignores plain text format when pasting text
Update sections if model content changes.
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
...
|
| | | | | | | | | | | | |
|
| | | | | | | | | | |\ \ |
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Task-number: QTBUG-14003
Reviewed-by: Michael Brasser
|
| | | | | | | | | | |\ \ \
| | | | | | | | | | |/ / |
|
| | | | | | | | | | | |\ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
|
| | | | | | | | | | | | | | |
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Task-number: QTBUG-13051
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Task-number: QTBUG-13999
|
