| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits)
Improve border image documentation.
Update border image examples.
Doc - micro fix.
Fix QML default property HTML generation... again.
Alpha needs to be part of rectangle cache key.
Bunch of doc fixes.
Doc: overview for Image
Code cleanup
Remove unused variable
Don't test snippets with C++ components
Don't unnecessarily regenerate property cache
Share Rectangle pixmap caches between items.
Move snippets to correct location
Make compile
Benchmark
Small cleanups
Fix snap at view boundaries with overshoot on.
Doc fixes
Emit hoverChanged appropriately when Item visibility changes.
Delete canvas after use in positioner unit tests
...
|
| | |
|
| | |
|
| | |
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changed "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \
into "subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
Reviewed-by: trust me
|
| |\ \ |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |_|_|/
|/| | |
| | | |
| | | | |
Also added the infrastructure for generating breadcrumbs.
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Removed nested <ul> elements from the TOC
Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)
Cocoa: quiting the app from the menubar may cause a crash
|
| | |/
| |/|
| | |
| | | |
Moved the class="leveli" into the <li> elements.
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits)
Do not treat images in qml examples differently.
Replace Flickable overshoot property with boundsBehavior
Autotests and doc
Give error on attempt to import types from too-early version number.
Remove (undocumented) QML bindings for effects.
De-straighten them lines.
Doc: fix QStringList model doc (really).
Doc: fix QStringList model docs
Change return type to match value().
Add duration and easing properties to AnchorAnimation.
Autotest
Remove dead code
Compile on Windows (export decl fix).
Fix versioning of Qt Declarative's in-built types
Fixed declarative/parserstress autotest.
Fix parsing of regular expression literals.
Fill out QGraphicsLayout bindings
Update test files to new syntax
Compile without Qt3 support.
Ensure workerscript.qml works (autotested).
...
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits)
Do not treat images in qml examples differently.
Replace Flickable overshoot property with boundsBehavior
Autotests and doc
Give error on attempt to import types from too-early version number.
Remove (undocumented) QML bindings for effects.
De-straighten them lines.
Doc: fix QStringList model doc (really).
Doc: fix QStringList model docs
Change return type to match value().
Add duration and easing properties to AnchorAnimation.
Autotest
Remove dead code
Compile on Windows (export decl fix).
Fix versioning of Qt Declarative's in-built types
Fixed declarative/parserstress autotest.
Fix parsing of regular expression literals.
Fill out QGraphicsLayout bindings
Update test files to new syntax
Compile without Qt3 support.
Ensure workerscript.qml works (autotested).
...
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Michael Brasser
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/template/style/style.css
tools/qdoc3/htmlgenerator.cpp
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-6336
|
|/ / /
| | |
| | |
| | | |
And this time I also did it for qdeclarative.qdocconf
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Adding links to the index page and removing HTML attributes like align and valing form the HTML generator
Reviewed-by: Martin Smith
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Linking correct files to the qdocconf files
Reviewed-by: Daniel Molkentin
|
|/ / / |
|
| |/
|/|
| |
| |
| |
| |
| | |
To generate the offline docs, do nothing.
To generate the online docs, add this to
your qdocconf file:
"online = true"
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|/ / |
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | | |
This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962.
|
|/ / |
|
| | |
|
| |
| |
| |
| |
| |
| | |
It isn't a full TOC yet. It only includes h1, h2, etc
from the Detaled Description part. In many classes, there
aren't any of these, so many classes won't have a TOC yet.
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | | |
Adding some image files.
Reveiwed-by: trustme
|
|/ / |
|
|/
|
|
| |
Each <ul> is now <ul class="leveli">, where i is 1..n.
|
| |
|
|
|
|
| |
This feature is not complete in this commit.
|
|
|
|
| |
Very cool.
|
|
|
|
|
|
| |
Coming soon!
Task: QTBUG-9504
|
|
|
|
|
|
| |
Coming soon!
Task: QTBUG-9504
|
|
|
|
| |
Task: QTBUG-9504
|
|\
| |
| |
| |
| | |
Conflicts:
src/gui/text/qstatictext.cpp
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
"node.cpp", line 1337: Error: There is extra text on this line.
Reviewed-by: Trust Me
|