| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g'
Manually patched files:
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h
demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
src/3rdparty/s60/eiksoftkeyimage.h
tools/qdoc3/test/qt-project.qdocconf
tests/auto/qsharedpointer/nontracked.h
tests/auto/qsharedpointer/nontracked.cpp
Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Explain which mkspecs have the configuration option
precompile_header set.
Task-number: QTBUG-25683
Change-Id: I9b11eafad16b65523cbb90897fe88829add58bea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/ad4bda8b754a5fb4f7c6d5c4c3b941579df83c41)
|
|
|
|
|
|
|
|
|
|
|
|
| |
You can specify a relative path to a .pro file in any directory.
Fixed a capitalization issue and a grammar issue and changed the
visible text in a link target.
Task-number: QTBUG-14139
Change-Id: Ib476bd400c46645709950c582492edcaaba9d7ed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/31e665c7cd9b2edb25fa695bed9c528c95ad0c64)
|
|
|
|
|
|
|
|
|
|
|
| |
Rewrite the note about specifying libraries on Windows
to make it clearer and change the library name to match the
one in the snippet.
Task-number: QTBUG-30229
Change-Id: I55c5579f5ead2fadc5d75baa2172b03f20c9f689
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-29307
Change-Id: I00d7faa32058a74955f57296dad900f150dbbf6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The supported file formats is implemented in
QHelpSearchIndexWriter::indexableFiles() function.
Task-number: QTBUG-30110
Change-Id: I3a0885f4c85ec7e14c5f0d4edbb33a463f657b54
(cherry picked from commit qttools/24f92f79e5d1198e79f4d46489af35999e8e74cf)
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
| |
Change-Id: I7b46898ae6ccc08d96095f1658f87c063aa6b487
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-25577
Change-Id: I89d6bc2c23283c802240194575a1a4c394b6e96f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-18101
Task-number: QTBUG-8673
Task-number: QTBUG-14194
Task-number: QTBUG-9109
Task-number: QTBUG-9466
Task-number: QTBUG-8323
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-21295
Task-number: QTBUG-14554
Task-number: QTBUG-8331
Task-number: QTBUG-8329
Task-number: QTBUG-8786
Task-number: QTBUG-8787
Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I051802bbfd127f14f362cbe6ecdf0f48461e360b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@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>
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-14305
Reviewed-by: Casper van Donderen
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The supported platforms page conatined a lot of platforms that are
untested for Qt 4.8, so those are removed. The platform notes had not
been updated since 2009 and were therefore severely outdated.
Nokia does not provide a commercial edition of Qt anymore. A user can
find the link to purchasing Qt through the Qt Developer Network at
http://developer.qt.nokia.com
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In the documentation there was missing icon in the
Object Inspector section. Added reference to
editbreaklayout.png icon and cleared a bit the
description. Added also the image to the
doc/src/images - folder.
Task-number: QTBUG-17739
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The qmake project files documentation lacked information about "*="-operator usage. Added couple of links pointing to
the qmake advanced usage - page where "*="-usage is explained.
Task-number: QTBUG-9675
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits)
qdoc3: Updates to qdoc to print error message in ALL CAPS
Doc: Added a note to Code Editor example docs
Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
Doc: Added a link in Symbian Intro to Required Capabilities
Doc: Added info on ordered targets for VS to qmake manual
Doc: Small addition to the QML anchor layout docs
Doc: Internalized QDeclarativeTypeLoader
Doc: Said that QIODevice::isSequential returns false by default
Doc: Said that QList::clear deallocates memory
Doc: Updated platform notes for MultiMedia and Phonon
Doc: Added links to the plugin deployment guide.
Doc: Fix doc bug in QMouseEvent
Doc: Fixed doc bug in QMetaObject
Doc: Fixed date format doc bug in QDateTime/Qt namespace
Doc: Removed internal Phonon classes from doce
qdoc3: Updates for QTBUG-20776; include fileToOpen path.
qdoc3: Updates for QTBUG-20776; clear map between runs.
qdoc3: Updates for QTBUG-20739 (no read-only for QML components)
qdoc3: Updates for QTBUG-20776 and QTBUG-20777
qdoc: Check pointer for null before dereferencing.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11988
Reviewed-by: David Boddie
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | |\ \ \ |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-587
(cherry picked from commit b1c421239ddb16a6c259af2298e0608961a1f3ba)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(cherry picked from commit 7d3e8674a757e351586d0625b8bad1d9cb771e8d)
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
|/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It is now possible to make shadow builds in Symbian.
Note that any relative host side paths specified via BLD_INF_RULES,
MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted
to point to build directory.
Task-number: QTBUG-10432
Rubber-stamped-by: ossi
Reviewed-by: TrustMe
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The graphics memory quota, which is a new feature in S60 5.4, now gets
default value of 24MB. User can override the default value using
RSS_RULES:
RSS_RULES += "graphics_memory=<# of kB>;"
Task-number: QT-4963
Reviewed-by: Sami Merila
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Passing the -datatags option to a QTestLib program prints the available
data tags to standard output.
Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:
Case 1: No tags:
f()
Case 2: Local tags only:
f() local tag 1
f() local tag 2
...
Case 3: Global tags only:
f() __global__ global tag 1
f() __global__ global tag 2
...
Case 4: Local and global tags:
f() local tag 1 __global__ global tag 1
f() local tag 2 __global__ global tag 1
...
f() local tag 1 __global__ global tag 2
f() local tag 2 __global__ global tag 2
...
...
Reviewed-by: Rohan McGovern
Task-number: QTQAINFRA-226
Change-Id: I14de203b586a0085b8efda8e62772711e44677d2
|
|\ \ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The enable_backup CONFIG value can be used to generate deployment
for backup registration file for an application.
BACKUP_REGISTRATION_FILE_SYMBIAN and BACKUP_REGISTRATION_FILE_MAEMO
variables can be used to specify a custom backup registration files.
Only works on Symbian and Maemo platforms.
Task-number: QTBUG-17214
Reviewed-by: Oswald Buddenhagen
|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/maemovibration.qdoc
|
| | | |
|
| | |
| | |
| | |
| | | |
(4.7-generated-declarative branch).
|
|\| |
| | |
| | |
| | |
| | | |
Conflicts:
examples/webkit/webkit.pro
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.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.
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | | |
This helps them to be marked up correctly in cases where code
markers are available.
|