| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed "SBSv2" and "Installing qt for the Symbian platform"
links from the installation.qdoc. Fixed platform security
link from the external-resources.qdoc.
Task-numbers: QTBUG-18313, QTBUG-18313, QTBUG-11312
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|\ |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc updates to "Installing Qt for the Symbian Platform" page.
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
add integrity gbuild to the project file for convenience
don't build activeqt examples on mingw
QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
Updated Russian translation
Ukrainian translation updated for 4.8
retreving -> retrieving
Removed duplicate Spectrum Analyzer entry from demos doc page.
Removed obsolete QWS_ALPHA_CURSOR feature.
Removed duplicate link from QFinalState documentation.
Clarified keypad navigation specific event documentation.
docs: Typo and link fixes.
Use the right callback in QObject::disconnect()
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-19735
Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ / |
|
| |
| |
| |
| | |
Reviewed-by: Jerome Pasion
|
| |
| |
| |
| |
| |
| | |
New files after previous license change round.
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/external-resources.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
"external-resources.qdoc" manually merged
"how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTWEBSITE-229
|
| | | | |
|
| |/ / |
|
| | |
| | |
| | |
| | | |
* Several external and internal (Qt) web links added
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
examples/webkit/webkit.pro
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added a link to the eLearning materials and Creator manual.
Reviewed-by: David Boddie
|
| | |/
| | |
| | |
| | | |
Task-number: QTBUG-16609
|
| | | |
|
| | |
| | |
| | |
| | | |
Removed user files
|
| | |
| | |
| | |
| | | |
Reviewed-by: David Boddie
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/example-slideswitch.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.pro
doc/src/snippets/code/doc_src_qtscript.qdoc
src/corelib/animation/qabstractanimation.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qdir/qdir.pro
tests/auto/qsslsocket/tst_qsslsocket.cpp
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie
|
| | |/ |
|
| | |
| | |
| | |
| | |
| | | |
Squashed commit containing changes to documentation during the
development of a threading tutorial, written by Roland Wolf.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | | |
11 instances of raw-html remain.
|
| | | | |
| | | | |
| | | | |
| | | | | |
And removed some \raw cases. Only 11 raw-html uses remaining.
|
| | | | | |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/propertybinding.qdoc
doc/src/overviews.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeview.cpp
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Merging qt-doc-team into cloned repository
|
| | | | |_|_|/ /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-16071
|
| | | | | | | | |
|