| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| | | |
|
| | |
| |
| |
| |
| | |
Merge-request: 1103
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add the missing image for doc of QNetworkSession.
|
| | | |
| | |
| | |
| | | |
The image is copied from Qt Mobility.
|
| |\ \ \ |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-17556
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | | |
Squashed commit containing changes to documentation during the
development of a threading tutorial, written by Roland Wolf.
|
| |\ \ \ \
| |/ / / |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-14959
Reviewed-by: Kent Hansen
|
| | | | | | |
|
| |\ \ \ \ \
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| | | |/ /
| |/| | |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added support for QMAKE_CLEAN in symbian-sbsv2
Only add NetworkServices capability automatically if no caps are set.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This allows overriding the NetworkServices capability for the
applications that do not need the capability even though they link
network, webkit, or declarative. It is also more intuitive as there
are no magic additions to user defined capabilities.
Task-number: QTBUG-17540
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \
| | |/ / /
| | | | /
| | |_|/
| |/| |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove sqlite3.sis from qt.sis.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Nokia Content Signing doesn't like embedded sis packages, so
remove the embedded sqlite3.sis from qt.sis. It must now be installed
separately just like Open C packages.
Task-number: QTBUG-17399
Reviewed-by: axis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 10c7730877d314ec4eda6728e2d66c38beff8d62.
Maemo/Meego support for this needs to be verified before this
can be added so reverting this for now.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The enable_backup CONFIG value can be used to generate deployment
for backup registration file for an application.
BACKUP_REGISTRATION_FILE variable can be used to specify a custom
backup registration file.
Task-number: QTBUG-17214
Reviewed-by: axis
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update modules-related tests and docs
CLeanup registers after AddString
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added tests for remote imports and fixed/improved examples and
text in the docs.
Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix auto test failure.
PathView regression: dragging the path didn't update currentIndex
Fix docs for variant and list basic types
Add test for importing plugins that contain QML files
Call onAdd() for first items added to ListView and GridView
Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master.
Don't clear pre-edit text when a graphics items loses focus.
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Make it clear that QML properties never store JavaScript object data,
and that inefficient serialization must be performed when JavaScript
objects are copied to QML properties.
Task-number: QTBUG-16624
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Support seperate versions of installed modules
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QML supports versioned types in modules. There's a version major and a
version minor.
This makes it possible to have a module com.organisation.fancycomponents
with version 1.0, and later you could ship a new module
com.organisation.fancycomponents which contains a more recent version 1.1
or 2.0 AND also the old versions to keep old code running.
This is good.
The problem is that this is difficult with certain QA procedures. It's
hard to verify that a new module is indeed 100% compatible with the
previous versions.
The change extends the import mechanism by adding optional versioning to
the component patch.
With the patch, you can add a new module
com.organisation.fancycomponents.2.0 which will be loaded when the
QML file specifies "import com.organisation.fancycomponents 2.0".
The patch works as follows: if you try to load
com.organisation.fancycomponents in version 2.0, the engine first
looks for com/organisation/fancycomponents.2.0, then for
com/organisation/fancycomponents.2 then for
com.organisation/fancycomponents.
Reviewed-by: Aaron Kennedy
Task-number: QTBUG-16455
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed warnings and other problems found while fixing markup.
Doc: Adding documentation on configure options for Qt configure
Ensured that trailing newlines are quoted and correct atoms are used.
Fixed build breakage.
Fixed C++ and plain markup found in \c commands.
Doc: Document display-orientation-related widget attributes.
Added a configuration variable for the QML documentation file prefix.
Doc: Renamed a tutorial image to avoid a clash with another image.
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Move the QtHelp tests in its own profile
Namespace compilation - OCI typedefs should be outside Qt namespace.
Fix some removeRows issues with QSqlTableModel.
Mention the requirement for OCI when building the SQL oracle driver.
Try to document that invalid database arguments use the default database.
Update some documentation about what happens with select()/setQuery().
Make sure that setRecord emits dataChanged() with OnManualSubmit.
QSqlTableModel/QSqlQueryModel and insertColumns problem.
tst_qsvgrenderer: works on shadowbuild
|
| | | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
As suggested by Jean-Louis Mounier.
Change-Id: I2284d00453ddcb981fe3e1b710d4453323fe1e9e
Task-number: QTBUG-8875
Reviewed-by: Charles Yin
|
| | |\ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
| | | | | | | |
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added \span and \div marked "new" and marked
\raw "avoid".
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
e.g. \span {id="color-red"} {Color this text only}, not this text.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
8 instances of raw-html remain.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
11 instances of raw-html remain.
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
And removed some \raw cases. Only 11 raw-html uses remaining.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
And removed some \raw cases. Only 13 raw-html uses remaining.
Added the figCaption clause to style.css.
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |\ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Some text were wrapped, therefore failing regression tests.
|
