| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Fixes for bugs: QTBUG-21067, QTBUG-17025, QTBUG-11489, QTBUG-20069,
QTBUG-3563, QTBUG-20089, QTBUG-13983, QTBUG-11820, QTBUG-14732,
QTBUG-14521, QTBUG-9675, QTBUG-18313, QTBUG-18313, QTBUG-11312,
QTBUG-17739, QTBUG-7678, QTBUG-14759, QTBUG-14756, QTBUG-14677,
QTBUG-16164, QTBUG-20721, QTBUG-15562, QTBUG-17029 and QTBUG-18544.
|
| |
|
| |
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| | |
merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
And removed some \raw cases. Only 11 raw-html uses remaining.
|
| | | | |
|
| | | | |
|
| |/ /
|/| | |
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativereference.qdoc
doc/src/snippets/declarative/focus/focusColumn.qml
tools/qdoc3/apigenerator.cpp
tools/qdoc3/apigenerator.h
tools/qdoc3/archiveextractor.cpp
tools/qdoc3/bookgenerator.cpp
tools/qdoc3/bookgenerator.h
tools/qdoc3/ccodeparser.cpp
tools/qdoc3/command.cpp
tools/qdoc3/command.h
tools/qdoc3/cpptoqsconverter.cpp
tools/qdoc3/dcfsection.cpp
tools/qdoc3/dcfsection.h
tools/qdoc3/jambiapiparser.cpp
tools/qdoc3/jambiapiparser.h
tools/qdoc3/javacodemarker.cpp
tools/qdoc3/javacodemarker.h
tools/qdoc3/javadocgenerator.cpp
tools/qdoc3/javadocgenerator.h
tools/qdoc3/linguistgenerator.cpp
tools/qdoc3/linguistgenerator.h
tools/qdoc3/loutgenerator.h
tools/qdoc3/mangenerator.cpp
tools/qdoc3/mangenerator.h
tools/qdoc3/polyarchiveextractor.cpp
tools/qdoc3/polyarchiveextractor.h
tools/qdoc3/polyuncompressor.cpp
tools/qdoc3/polyuncompressor.h
tools/qdoc3/qsakernelparser.cpp
tools/qdoc3/qscodemarker.cpp
tools/qdoc3/qscodemarker.h
tools/qdoc3/qscodeparser.cpp
tools/qdoc3/qscodeparser.h
tools/qdoc3/sgmlgenerator.cpp
tools/qdoc3/sgmlgenerator.h
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/uncompressor.cpp
tools/qdoc3/webxmlgenerator.cpp
tools/qdoc3/webxmlgenerator.h
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix number of chapters in qtestlib tutorial.
Fixed QStatusBar not to repaint itself too early
QNAM HTTP: Fix missing error() signal
Make it clear which security updates are needed for Visual Studio 2005.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As well as Service Pack 1, the compiler also needs four additional
security updates in order to work correctly with Qt's pre-built binary
package.
Task-number: QTBUG-7633
Reviewed-by: Toby Tomkins
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
|
| |/ |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/platforms/compiler-notes.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
tools/qdoc3/pagegenerator.h
|
| |
| |
| |
| | |
Initial-review-and-suggestions-by: axis
|
| |
| |
| |
| | |
Related to change f447ae026637a75d565e9347eb19f33d09557039.
|
|/
|
|
| |
Fixed some \table problems as well.
|
| |
|
|
|
|
|
|
| |
In the repository, we should always use the No Commercial license
alongside the GNU Free Documentation License for documentation
files.
|
|
|
|
| |
Reviewed-by: Morten Engvoldsen
|
|\
| |
| |
| |
| |
| |
| |
| | |
doc-4.7
Conflicts:
doc/src/getting-started/examples.qdoc
doc/src/index.qdoc
|
| |
| |
| |
| | |
Reviewed-by: Janne Koskinen
|
| | |
|
| | |
|
|/
|
|
| |
Reviewer: Morten Engvoldsen
|
| |
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
| |
|
| |
|
|
|
|
| |
Done with: Axis
|
|
|
|
|
|
| |
The iPhone simulator conflicts with the package installer.
Task: QTBUG-7003
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Sales and Legal
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Old link was defunct as the version it pointed is no longer available.
Task-number: QTBUG-8134
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8012
Reviewed-by: Iain
|
|\ \
| |/
| |
| |
| | |
Conflicts:
doc/src/getting-started/installation.qdoc
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-7294
Reviewed-by:Gareth Stockwell
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"run" target no longer is just for running emulator targets.
Also added TRK for optional requirements.
Reviewed-by: axis
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6348
Reviewed-by: Janne Koskinen
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-6574
Reviewed-by: Trust Me
|