| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
QDocconf files was out of date in the section including extra files
Style now shows numbered lists corectly
(cherry picked from commit cbba0a1ea1e727cca4ca09c216e4f5a306083ba4)
(cherry picked from commit 288e8a2cd4be9033af39fb5d309e855a582081bd)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
(cherry picked from commit 78381dbc9701015aef43736fb7d22cf6e66984c7)
|
|
|
|
| |
(cherry picked from commit 9986c3f0c0681c7ea8bc8e5cfea5662880db6654)
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
To-be-really-reviewed-by: Qt Doc Team
(cherry picked from commit 3833dc0a0535fa8320e17c741ca2746e9bebcaa9)
Conflicts:
tools/qdoc3/htmlgenerator.cpp
|
|
|
|
|
|
|
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-11938
(cherry picked from commit eea84818e98af917d3cf2bf04ea17a416ef9d55e)
Conflicts:
src/script/api/qscriptcontext.cpp
|
|
|
|
|
| |
Task-nr: QTBUG-13096
(cherry picked from commit 002c89aeb44c805d642be2d4e4a19422be877bc2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
|
|
|
|
| |
(cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)
|
|
|
|
| |
(cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)
|
|
|
|
|
|
| |
Flags allowed are now -creator and -online. -creator is
the default.
(cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)
|
|
|
|
| |
(cherry picked from commit 62968f33452016b31020e524fa6ba6d2cefd0278)
|
|
|
|
|
|
|
|
|
|
| |
The flags allowed on the command line are now:
-online (default), -base, -assistant (same as -base),
and -creator. If you don't specify one of these, you
see a warning in the error output telling you that it
didn't find an application flag and that it generated
online docs by defualt.
(cherry picked from commit d4dceca5dcd9252e09a421b65b318a7178049cd1)
|
|
|
|
| |
(cherry picked from commit a53b98f9269e6ee0b524fe7477e8fb46f189f9d3)
|
|
|
|
|
|
|
|
|
| |
These no longer do anything in qdocconf files:
online = false
offline = false
creator = true
(cherry picked from commit 7de8a0c487ce6a7f13c2028e93648807ef7d8e8b)
|
|
|
|
|
| |
Task-Nr: QTBUG-12278
(cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
|
|
|
|
|
| |
Task-Nr: QTBUG-12278
(cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
|
|
|
|
| |
(cherry picked from commit b588cfe80741ec500fc0a52586145e5849ca5968)
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-11512
(cherry picked from commit d8908922f339892fee4275a433e2bf6da87ae055)
|
|
|
|
| |
(cherry picked from commit e0a102ee171ddcebb1104d98d8a4ff4993e91c1d)
|
|
|
|
|
| |
Task-number: QTBUG-12157, QTBUG-12148, QTBUG-12146
(cherry picked from commit d3f67bfe7cd1cc39d25e6a7371b2b185591008c4)
|
|
|
|
| |
(cherry picked from commit 1d3aa6681423d7a39a8ed375448a9418ef33a1f5)
|
|
|
|
| |
(cherry picked from commit c50d351df3b7fe2f0d10444c1080b6a8c9833e0f)
|
|
|
|
|
|
|
| |
Adding a variable to the qdocconf file will now generate the docs in Creator format
Reviewed-by: Martin Smith
(cherry picked from commit e649d255bc3785c9af7c36e743ac204c8890137e)
|
|
|
|
| |
(cherry picked from commit bc16436e33cfc61e0009474186cbb8210fb51df7)
|
|
|
|
| |
(cherry picked from commit 25ace9513587abb5e52f78d900e6bec7b04bb663)
|
|
|
|
| |
(cherry picked from commit 5a6e3d952327753cb0cc00fa22804c5dab435c39)
|
|
|
|
| |
(cherry picked from commit a538ccb93fd05b26dc7a7058bbb62e0dcb682f81)
|
|
|
|
| |
(cherry picked from commit 3062dac75befacffc1964d49392a58f5fb0b583f)
|
|
|
|
| |
(cherry picked from commit 896de79554060aadf4963d8285ef3f5d8740428b)
|
|
|
|
| |
(cherry picked from commit 0ad74254d0810459bc08fdf9c0898a0d73f596b0)
|
|
|
|
|
| |
Task-number: QTBUG-12038
(cherry picked from commit 5903558f17a7a3173ad7a592892262bf297b52f2)
|
|
|
|
|
| |
Task-number: QTBUG-11992
(cherry picked from commit 28f84d2ed4000391f855140f57c359bc858d4799)
|
|
|
|
|
| |
Task-number: QTBUG-11679
(cherry picked from commit 69910bc33dc448a9aa81eb00ed45be6d0488e447)
|
|
|
|
|
|
|
| |
Also simplified some code.
Task-number: QTBUG-6340
(cherry picked from commit f14b644004498dc6fb1a9437b81e3164e89bfdb5)
|
|
|
|
|
|
| |
Also reworded some of the text for QTBUG-11575.
Task-number: QTBUG-6340, QTBUG-11575
|
| |
|
|
|
|
| |
Task-number: QTBUG-6340
|
|\
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Task-number: QTBUG-11346
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket::systemCaCertificates(): have one common case for all Unices
Fixed QX11EmbedContainer.
Improved a bit detection of a touch screen on Windows.
qdoc: Fixed invalid format in the html header.
link glu32 before opengl32
Stopped trying to output QML property list in 2 columns
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11803
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11009, QTBUG-11096
|
| |/
| |
| |
| |
| |
| |
| | |
This fixes a version clash when both qt.qch and qml.qch are loaded
into Qt Creator
Done-with: Daniel Molkentin
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|\ |
|
| |\ |
|