| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
| |
|
| |
|
|
|
|
| |
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
|
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number:
Reviewed-by: Bea Lam
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed by: David Boddie
Task: QTBUG-13243
|
|/ / / /
| | | |
| | | |
| | | |
| | | | |
Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321
Reviewer: David Boddie
|
| |_|/
|/| |
| | |
| | | |
Reported on the qt-qml mailing list.
|