| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Task-number: QTBUG-23874
cherry-picked from qtbase c8156cab81690526adffa22214657fc1c6563b8b
Change-Id: I371a3eb3f4145d80e9f51fe89d61bac5c269d587
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Improved comment finding code.
Added language information to the pure documentation parser.
Doc: Fixes to Qt tutorial
Fixed external link to DevNet Wiki.
qdoc: Fixed a crash caused by accessing a null pointer.
Doc: Fixed the example of an encoded URL in the class description.
Doc: Added a copy of the online style images for the qdoc manual.
Doc: Removed the Google Analytics script.
|
| |
| |
| |
| | |
Reviewed-by: Jerome Pasion
|
|/
|
|
|
|
|
|
| |
These are cosmetic changes to files that do not end
with a newline character.
Change-Id: I5b3e270386a1ef1ea2c1f57a1de3f7e3a8a52f5a
Reviewed-by: Rohan McGovern
|
|
|
|
| |
(4.7-generated-declarative branch).
|
|\
| |
| |
| |
| | |
Conflicts:
examples/webkit/webkit.pro
|
| |
| |
| |
| | |
Task-number: QTBUG-16609
|
| |
| |
| |
| |
| | |
Squashed commit containing changes to documentation during the
development of a threading tutorial, written by Roland Wolf.
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Task-number: QTBUG-16865
|
| |
| |
| |
| | |
Task-number: QTBUG-16609
|
|/
|
|
| |
Task-number: QTBUG-16609
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Task-number: QTBUG-14238
|
|
|
|
| |
Task-number: QTBUG-14238
|
|
|
|
| |
old file name references.
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
|\ |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Tested with namespaced and non-namespaced Qt builds.
Reviewed-by: Trust Me
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
examples/tutorials/modelview/3_changingmodel/mymodel.h
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Recognize @, #, $ and ` as word separators
rebuild configure.exe
Fix dependencies so JOM will handle parallellization properly
Symbian: Disable IPv6 for now
Doc: Fixed namespaced Qt build breakage in the model/view tutorial.
Doc: Fixing links on index page and corecting HTML in the template.
Accept empty authority segments in QUrl as different from not-present
Doc: Adds line about non-support for Webkit on Solaris
protect nil dictionary from release.
Fix potential KERN-EXEC 0 on Symbian.
Ukrainian translation updated
Fix remote crash in delivering D-Bus calls with too few arguments
Ensure that OpenGL contexts are attached to an NSView before first paint
Doc: Updating the 3rd party lib used in Qt - including JQuery
Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.
Reduce memory consumption of QtScript/JSC on Symbian
Doc: Updated Supported Platforms page. Finished
New binary of configure.exe with -mp/-no-mp option
Turn Makefile.win32 into batch-mode, enable /MP and PCH
Add option to enable -MP compile option for MSVC
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: hjk
|
|/ / |
|
|/
|
|
| |
Reviewed-by: Trond
|
|\ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf.
The given example does not meet the autotest requirements for QML
examples. These involve that it starts without error messages, and that
it follows our naming convention of the start file starting with a
lowercase letter.
Please run the tests/auto/declarative/examples before pushing new
declarative examples. If new examples should be exempted from these
checks, add them to the list of exceptions in that autotest.
|
| | |
|
|/
|
|
| |
QTBUG-7071 and QTBUG-10173
|
|
|
|
| |
attributes.
|
| |
|
|
|
|
|
|
|
|
| |
This commit attempts to fix the latest staging failure.
According to Nokia Legal, .pro files are not copyrightable and thus need
not carry license headers. In any case, C-style comments aren't valid
for .pro files and broke the build.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
| |
|
| |
|