| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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-18359
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commits
0274e68767cce6440515a68d6af868725d5577a4
2770b1277744bb676e96e4ae8c89acd645ec895d
02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1
fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d
d1f9a534da288884f443a975f428b0cfe0a7b29b
205d607c3387d074fb87f8deb77a8f515ae2e189
32d200da9cc7a4dfb3f302f22ef5718a286845c9
3e0df49f978933b1e4e6b48c695bf813ec9a2828
82bbc1c1611bde33680d22a1a3c6449e51d7b0b9
b78ffe51f9a4c4ac705e435d45fffe39864c032d
fe438d7d828021d7f86301af36fe8dff2768532a
df30d58de183d13c649ef7e0fbb8e2b3658e0862
fa845566b3733bc06454b71e33b1ff405ba32280
4f9a318d639c4e7e09e56751d31608fb39d472af
4810b587a65d81f8f90646efd09cadeb1276a756
7bad867382ad6c84155ffcfbb361709a8e8184ab
64ec011c6132496eb9555c1d09e7fd4ddf472837
81492e56aba5b5761500543665012a85d6835513
b668857b3749b39c3a61e0a25e750740b74df552
78a7a02b3b85435bc28eb23e9210522467171e42
Reviewed-By: Ralf Engels
|
| |/
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|/ |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Tidied up QFileOpenEventPrivate destruction.
Commented the Duplicates to explain their benefit.
Remove the file exists check from ProcessCommandParametersL
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| |
| |
| |
| | |
removed an unnecessary local QString
Improved some comment wording
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QFileOpenEvent's open method now opens the QFile with an RFile handle if
possible. It takes a duplicate of the handle and transfers ownership to
the QFile, so that the QFile can be used many times and outside of the
lifetime of the QFileOpenEvent.
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
An application needs some way to get an open QFile when a QFileOpenEvent
contains a Symbian file handle. Rather than exposing that file handle
and forcing platform specific code to the application, this method
hides the details giving an effective universal method for turning a
QFileOpenEvent into an open QFile.
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QFileOpenEvent needs to tell the recipient what file to open. Normally
that is by filename. But on Symbian, some files can only be opened from
an already-open file handle that has been passed in. For example data
caged files in c:\private or z:\sys. So QFileOpenEvent needs to be
able to hold a Symbian file handle so that the recipient can access
any file requested of it.
Coming soon... a method by which the reciever can access the file
without knowing about all this messy file handle stuff going on behind
the scenes.
Task-number: QTBUG-15015
Reviewed-by: Shane Kearns
|
|/
|
|
|
|
|
| |
These are needed for compositor applications to be able to send the
raw scan codes to the clients.
Reviewed-by: Jørgen Lind
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This merge consists of the actual kinetic scroller implementation, its
autotests plus a few examples. QAbstractScrollArea and QAbstractItemView
have been extended to support the new scroll events.
The complete history is in
http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture
(part 2 is the QML Flickable replacement / part 3 is QWebView support)
Task-number: QTBUG-9054
Reviewed-by: Ralf Engels
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/qml-examples.qdoc
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| |/ |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| |
| | |
Merge-request: 535
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|/
|
|
|
| |
Merge-request: 572
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Explaining the difference between hover events and enter/leave/move events
Task-number: QT-1116
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GetURL events are delivered by Launch Services to the application if the
application is registered as the default handler for the given protocol,
and the user for example issues 'open http://foo.com/' in the console or
clicks a link in another application.
The GetURL event is converted to a QFileOpenEvent, which now has both a
QUrl constructor and a url() method. These two new methods work in sync
with the file() method, so a QFileOpenEvent constructed from a QUrl will
return a valid file name from file() if the URL was a local file.
The boolean argument to AEInstallEventHandler decides whether the handler
is to be added to the system event dispatch table or the application's
event dispatch table. Previously we added it to the system table, but
this did not work for the GetURL event. We now use the application event
table, which works for all three of the events we register on Carbon.
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qevent.cpp
src/gui/kernel/qgesture.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts:
dist/changes-4.6.0
src/gui/kernel/qevent.h
|
| |
| |
| |
| |
| |
| | |
Changes to the gesture api after the review.
Reviewed-by: Jasmin Blanchette
|
| |
| |
| |
| | |
Reviewed-by: David Boddie
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qevent.cpp
src/network/ssl/qsslerror.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | | |
The widget() getter is still publicly documented, follow the lead of
other events to make the setter internal.
|
| | |
| | |
| | |
| | |
| | |
| | | |
type argument.
Reviewed-by: Thomas Zander
|
| |/
| |
| |
| | |
Reviewed-by: Thomas Zander
|
|/
|
|
| |
Reviewed-by: tom
|
| |
|