| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits)
Fix Text::elide docs.
Fix Rectangle painting at small sizes.
Fix QML ecmascript autotest.
Fix QtQuick import.
Export QDeclarativeDebugHelper on Symbian for QTBUG-13762
Don't use stdint.h in our headers since it is a C99 header.
Text alignment is broken with multi-line text and implicit size.
Update QtOpenVg def files for bug QT-3589
Image bounding rect should always include the area being painted
Fix minehunt.pro (minehunt is no longer a plugin)
Don't allow flagging of flipped tiles in Minehunt
Remove Snake demo from QtDemo
Fix samegame text input focus
Whitespace fixes
Update visual tests for Mac.
Run all QML visual tests now.
Make qmlvisual tests more stable
Add documentation about script evaluation context and allowed types
Maintain passing visualtests on X11
Fix errors in example code. Also reverts the example code to the old
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Image bounding rect should always include the area being painted
Fix minehunt.pro (minehunt is no longer a plugin)
Don't allow flagging of flipped tiles in Minehunt
Remove Snake demo from QtDemo
Fix samegame text input focus
Whitespace fixes
Update visual tests for Mac.
Run all QML visual tests now.
Make qmlvisual tests more stable
Add documentation about script evaluation context and allowed types
Maintain passing visualtests on X11
Fix errors in example code. Also reverts the example code to the old
Largely rewrite the Using QML in C++ Applications documentation. It
Document list type operations
Fix regression in 648eb76c and update visual tests.
Don't emit xChanged()/yChanged() twice.
Add testcase for QTBUG-13719.
Doc fix
highlightranges.qml example and visual test contained binding loop.
Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
now has an overview of different approaches to QML/C++ integration
and demonstrates how to pass data between QML and C++ through
properties/functions/signals. The part in the old docs that focused
on QDeclarativeContext has been merged into the QDeclarativeContext
class docs (although most of the info was largely covered in there
already) and the part that covered Network Components has been
moved to the QDeclarativeComponent class docs. The custom enum
types example previously in extending-tutorial.qdoc has been
moved to these new docs.
Task-number: QTBUG-14923
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed deployment for symbian/linux-armcc when using shadow builds.
Started using qtmain.lib for all Qt applications, also corelib ones.
Make qmake to pass all UTF-8 characters unchanged through parser.
Implement support for DEPLOYMENT.display_name in Symbian
Added .flags modifier support for DEPLOYMENT items in Symbian
Make default application deployment removable
Allow pkg_prerules and pkg_postrules to be targeted to separate files
Added missing def file symbol.
Revert "Use qtmain.lib to provide entry point for all Symbian applications"
Fixed test after the fix to QT-4077.
Fixed event starvation with pointer events on Symbian.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The default package name and the default name that appears in
the application menu is derived from the TARGET variable.
Often the default is not optimal for displaying to end user.
To set a better display name for these purposes DEPLOYMENT.display_name
variable can now be used.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 9cb24d1c4b7359ec84708ba770050de720b50cdf
Task-number: QTBUG-15068
Task-number: QTBUG-14280
Reviewed-by: Janne Anttila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The .flags modifier can be used to specify pkg flags for files.
For example, to make default application run after install:
default_bin_deployment.flags += FR RI
For example, to show a note at installation time:
notedep.sources = install_note.txt
notedep.flags = FT TC
DEPLOYMENT += notedep
See Symbian package file format documentation for exact supported
flag values.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 50b2477e6ffd64a0730cc5c0f0a6190b1a6b5861
Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: Janne Anttila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Default application deployment was hard coded in qmake, so it was
impossible to replace with custom deployment. Now the default deployment
is generated via .prf files and is removable.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 494ce0dac35c7ade0ce78589878597a7ca912864
Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: axis
Conflicts:
qmake/generators/symbian/symbiancommon.cpp
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.
Also clarified documentation of these variables.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: a537137fffd72d153a35828228c00567a563e787
Task-number: QTBUG-15068
Task-number: QTBUG-13159
Reviewed-by: axis
Conflicts:
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.qdoc
|
|/ /
| |
| |
| | |
Initial-review-and-suggestions-by: axis
|
| | |
|
|/ |
|
| |
|
|
|
|
| |
Task-number: QTBUG-13789
|
| |
|
|\ |
|
| | |
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging.
Doc clarification.
Fallback to A8 text rendering on Mac when LCD smoothing is disabled
Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1
Autotest that new "import Qt 4.7"s aren't added accidentally
Document "import QtQuick 1.0" change
Replace "import Qt 4.7" with "import QtQuick 1.0"
Add test for Qt 4.7 module
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Correct property type of PathAttribute::value in the docs.
Register QtQuick 1.0 module.
Remove unused AST node destructors.
Fix crash when trying to append a null transform to QDeclarativeItem.
Documentation.
Documentation fix for Flickable (mark content properties as real, not int).
QDeclarativeDebugClient: Fix gcc warning
QmlDebugService: Check that there is a receiver before sending messages
If a type is registered under several names, share the attached property object
QmlViewer: Fix typo in comment
QmlViewer: Fix assert on exit (Windows)
...
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QFontMetrics::lineWidth() for fonts with defined point size
Implemeting, exporting and autotesting QFont::lastResortFont()
Fixed compile error on non-Symbian platforms.
Fixed regression when typing in QTextControl based widgets on Symbian
Fixed incorrect snippet in BLD_INF_RULES documentation
Streamlined smart installer package creation
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13988
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
(cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
|
| | | |
|
|\ \ \ |
|
| |/ / |
|
| |/
| |
| |
| |
| | |
Task-number: QTBUG-2210
Reviewed-by: David Boddie
|
|\ \
| |/ |
|
| |\ |
|
| | | |
|
| | | |
|
| | | |
|
|/ /
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Reviewed-by: David Boddie
Tasks: QTBUG-10077
|
|\ \ |
|
| |\ \
| | |/ |
|
| | | |
|
| | | |
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/snippets/declarative/qml-intro/basic-syntax.qml
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\ \ |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Cleaned up the contradiction identified in QTBUG-10114.
Reviewed-by: David Boddie
Bug: QTBUG-8961, QTBUG-10114
|