| 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>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@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-23239
Change-Id: I12f89a4e595231738985ca0cf3179fee7de9fa72
Reviewed-by: Shane Kearns <shane.kearns@accenture.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>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
| |
Each thread needs at least one current request if it has any queued
requests, this is to stop the queue stalling.
When starting a queued request, start it in the same thread it belongs to
When aborting a request from the wrong thread, just detach it (it will
complete normally but the slot isn't connected, and then delete itself)
Reviewed-by: Markus Goetz
|
|
|
|
|
|
| |
Manger -> Manager
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
| |
Add additional check when starting a queued request, as the cache may
have been populated while the request was queued.
Put completed requests in the cache (note cache code internally discards
errored results and only caches successful results)
Reviewed-by: Aaron Tunney
Reviewed-by: Markus Goetz
|
|
|
|
| |
Reviewed-By: Shane Kearns
|
|
|
|
|
|
| |
For maintainability, it's better to use Qt's container classes
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
| |
Calling symbian asynchronous functions with parameters on the stack,
even "in" parameters is unsafe. If the server is blocked on another
operation, then it will not read the parameters until later (at which
time the stack is invalid)
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
| |
Declaring iStatus in a derived class hides the iStatus in CActive.
This confuses the active scheduler (which is using CActive::iStatus) and
would in a normal symbian application have caused a stray signal panic.
However as Qt's event loop integration uses CActiveScheduler::RunIfReady
instead of the normal CActiveScheduler::Start the panic does not happen.
Instead the thread semaphore gets messed up and causes problems.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
| |
Private API, QHostInfoPrivate::fromName, which is called from
QAbstractSocket when the network session property is set.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
| |
Pass the shared network session pointer into the QSymbianHostResolver
(which maintains a reference for its lifetime). This is used to open
the RHostResolver handle, in order to get a host resolver which is
associated with a particular session.
The session is obtained from the _q_networksession property of the
QAbstractSocket, as in the symbian socket engine
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It was hanging because although the error flags were set, the callback
was not emitted and nothing was done with the return value from the
function.
Now, it sets the state to error, and self completes - so that the
completion through RunL is used as normal. Because the state is error,
the processing of name/address is skipped and the error string is not
rewritten.
Note, error being detected at this point is only common when using an
explicit network session (as RHostResolver::Open can fail if the
RConnection is in the wrong state)
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
| |
Symbian host info implementation was using default constructor for
the results, which sets the id to -1, and storing the id seperately.
Changed this to use the constructor that specifies the id, and use the
id inside the results instead of storing it separately (just a change
to the accessor function)
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
| |
Reviewed-by: Shane Kearns
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.
Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| | |
Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.
Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
|
| |
| |
| |
| |
| |
| | |
Thanks rittk!
Reviewed-by: Olivier
|
| |
| |
| |
| | |
Reviewed-by: Thiago
|
|/
|
|
| |
Reviewed-by: Thiago
|
|
|
|
|
|
| |
Ensure that one test won't interfere with the next
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
| |
Ensure that the threadpool QHostInfo uses internally has cleanup its
threads when the application exits. This avoids the warning from
QWaitCondition on Windows (which happens due to thread termination at
application exit).
Task-number: QTBUG-7691
Reviewed-by: mgoetz
|
|
|
|
|
|
| |
By default enabled, but it can be disabled via a compile flag.
Reviewed-by: Thiago
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Instead of sequentially looking up and potentially taking
a long time, we now do work in parallel.
Reviewed-by: ogoffart
Reviewed-by: lars
|
|
|
|
|
|
|
|
|
|
| |
patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting
forever for the thread to terminate, which did not always succeed due to
a Linux kernel bug. Now, we just wait for some time and then return
anyway.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-5296
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|