| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Support ".." in QCH documentation file paths.
This essentially means that we stop using cleanPath, and where needed,
prepend the virtual folder name, followed by "/..", in front of the
original path.
- Remove com.trolltech default DocPath since this was not used anymore.
(Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939)
Change-Id: I6508529de756bad979356c63bfcf6c55a609e827
Done-with: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Reducing the amount of spelling errors from NBN.
Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86
Reviewed-by: Rohan McGovern
|
|/
|
|
|
| |
Merge-request: 2669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15787
Task-number: QTBUG-15788
|
| |
| |
| |
| |
| |
| |
| | |
This is mostly the same as for unix.
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Since I can't touch merge requests, this is a separate commit to fix
whitespace errors in code.
|
| |
| |
| |
| |
| | |
Merge-request: 2534
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
CID 22165.
Merge-request: 2534
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
CID 22164.
Merge-request: 2534
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-14393
Reviewed-by: ck
|
|/
|
|
|
| |
Task-number: QTBUG-12963
Reviewed-by: ck
|
| |
|
| |
|
| |
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
|
|
|
|
|
|
|
|
|
| |
there are now per-language ts-<package>-<lang> and ts-<lang> targets to
update only the files relevant for a given language.
there is also a ts-all target which does what the old ts target did.
the ts-<package> targets are now named ts-<package>-all and should not
be used manually - they exist for the convenience of the ts-all target.
the ts target is now only a help blurb.
|
|
|
|
|
|
| |
lupdate is now powerful enough to use the real project files.
this avoids that the file lists run out of sync (which they did, though
not as much as i expected).
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Task-number: QTBUG-11049
Reviewed-by: ck
|
|
|
|
| |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits)
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
...
|
| | |
|
|/
|
|
|
| |
Task-number: QTBUG-4519
Reviewed-by: kh1
|
|
|
|
| |
Reviewed-by: ck
|
|
|
|
|
|
|
|
|
| |
This improves the INSERT performance dramatically, since we won't wait
anymore until all data is written back to the database. Should not have
any impact on the database consistency in case of an app crash, only in
case the whole OS crashes, but then you might be in trouble anyway.
Reviewed-by: ck
|
|
|
|
| |
Reviewed-by: kh1
|
|\
| |
| |
| |
| | |
Conflicts:
configure.exe
|
| | |
|
| |
| |
| |
| | |
With the QT_USE_OPERATOR_PLUS, we need to cast before converting to QVariant
|
|/
|
|
| |
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7821
Reviewed-by: kh1
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: kh1
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
A few trivial optimizations
Rewrote bookmark handling, the previous code was just plain awful.
Small style cleanup.
Fix some warnings.
Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
Designer: Support the 'windowOpacity'-property for forms.
Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
Assistant: Treat "unfiltered" filter in a apecial way.
Assistant: Give meaningful context to translations.
Fixed handling of paths containing ".." in QFileSystemModel on Windows.
QAbstractItemModel docs: Fix typo.
Assistant: Eliminate private tr contexts.
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: kh1
Instigated-by: Friedemann Kleint
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merging private tr contexts into the surrounding class keeps
related strings together.
Contributed-by: Ritt Konstantin
Reviewed-by: kh1
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| | | |
|