| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
This test is now passing on all CI platform
Change-Id: Ib16a0e1e914ae85271f751f66bdece7e4ec851b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
|
|
|
|
|
|
|
|
|
| |
- Statement has no effect
- Adding int to string
- Unspecified behavior when comparing character literals.
Change-Id: Ie9cb9a1036b5cf5c62890685c60dee4af1ce7148
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
|
|
|
|
|
|
| |
Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We must not close the socket, if there's still data in the read buffer.
Also waitForReadyRead must return true, even if the pipe is broken after
we've read data.
QLocalSocket::readData will close the socket after the buffer has been
drained.
This fixes the flakiness of tst_QLocalSocket::threadedConnection.
In Qt5 large portions of this code has been rewritten and this fix does
not apply.
Task-number: QTBUG-27816
Task-number: QTQAINFRA-574
Change-Id: I467340d4dbab11056e6720b145a94a87156cb419
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
Build 937 failed again to flaky tst_qlocalsocket autotest. Move
CONFIG+=insignificant_test to correct project to get CI more stable.
Change-Id: I46557ee0d1be9b9168a88595848a745d6140d7ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Make sure that we run at least the non-flaky QLocalSocket
tests.
Task-number: QTBUG-27816
Task-number: QTQAINFRA-574
Change-Id: I38bb0111248ff71dc8679e81ca418f9e2f7b98e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
| |
Change-Id: I415c57aaf3454a9a40adc1dc51977386bada163a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The tests are now run from the 'debug',
'release' subdirectories on Windows by 'make check'.
Go up one directory so that the relative paths are correct.
Non-network tests.
Change-Id: I8d0f806ff6708c3111a39c861ed46b21881acc7b
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Marked the following tests insignificant due to failures, these need
to be fixed later and then re-enabled:
tst_qlocalsocket
tst_selftests
Task-number: QTQAINFRA-428
Change-Id: I294048133bac141dfd6239dba115dcc93035f868
Reviewed-by: Jyri Tahtela <jyri.tahtela@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>
|
|
|
|
|
|
|
|
|
|
| |
Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'. This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.
Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a
Reviewed-by: Jo Asplin
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro
|
| |
| |
| |
| | |
Reviewed-by: Rohan McGovern
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
This function always returned false, even if the socket was connected.
Task-number: QTBUG-18204
Reviewed-by: Martin Petersson
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|/
|
|
|
|
|
|
|
|
|
| |
Due to the change from default deployment in symbian from being hardcoded
in qmake to being in default_deployment.prf the .pro files needed to be
changed.
Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise
the default deployment lines are not added and the test won't install.
Reviewed-By: Miikka Heikkinen
|
| |
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| | |
In waitForReadyRead we didn't check for synchronous connection loss.
Autotest added: tst_QLocalSocket::syncDisconnectNotify
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we notice a broken pipe via _q_notified, we should call close
in case the internal read buffer is empty.
Auto test added: tst_QLocalSocket::asyncDisconnectNotify
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/webkit merged with checkout --ours
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
src/gui/kernel/qt_s60_p.h
src/gui/text/qfontdatabase_s60.cpp
src/script/api/qscriptengine.cpp
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reading from a socket with a broken connection didn't work, even if
there were still bytes to read in the internal read buffer.
Autotest: tst_QLocalSocket::writeToClientAndDisconnect
Task-number: QTBUG-10921
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| | |
Fixed race condition on connection.
Done-with: ossi
Reviewed-by: ossi
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
| |
| |
| |
| | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
|/
|
|
|
|
|
|
|
|
|
| |
The autotests were previously run with ALL-Tcb capability which gives
them more access to the filesystem etc. than a typical Qt application.
To have more realistic testing environmnent, tests are run with no
capabilities other than those required for the Qt APIs they use.
i.e. NetworkServices for network tests, None for others.
Reviewed-by: Liang Qi
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
| |
... to make sure bytes are availabe to read
Reviewed-by: Aleksandar Sasha Babic
|
|
|
|
|
|
|
|
| |
... as described in the documentation. Furthermore:
* use qt_safe_select to timeout correctly
* return immediately when timeout value is 0
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
|
|
|
|
| |
Due to bad merge some of the cases were removed.
They have been restored now.
Some adaptation for Symbian platform was needed as well.
We must not forget that local socket implementation is
based on RSocket, and therefore similar to having TCP_SOCKET
as basckend. So, in soe places it we had to give some time
for events to propagate by introducing qTest::wait()
lines.
|
|
|
|
|
|
| |
no more qApp->processEvents() !
Reviewed-by: ossi
|
|
|
|
|
|
| |
We must wait until all data is written before trying to read stuff.
Reviewed-by: ossi
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| | |
Have QWindowsPipeWriter emit a bytesWritten signal and have
QLocalSocket connect this to its own bytesWritten signal.
This change contains an autotest to check for the signal emission.
Previously there was no implementation to emit the signal.
|
|/
|
|
|
|
|
|
| |
Currrently Qt/S60 does not compile with QtScript enabled -> That's
why we need to disable all autotests depending on it if QtScript is
disabled.
Reviewed-by: Miikka Heikkinen
|