| 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>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27571
Change-Id: I93e55996158f4c5c18c65cc56877f21448d4564e
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These tests failed on latest Digia hosted Qt 4.8 CI builds (919 and 921),
marking them temporarily insignificant to get CI passing.
See task: QTQAINFRA-574
tst_networkselftest failed because there is no OpenSSL installed on CI
devices. This will be fixed as soon as I have access to VMs and they are
free from builds.
tst_qthread and tst_qxmlquery timed out after default 450 seconds,
I need to check how long these test take to complete in our environment
to increase timeouts or is it actually so that execution of these tests
freeze for some reason.
I'm marking these insignificant for all platform for now, since I don't
yet have test results from Macs. It might be that some of these tests fails
also there.
Change-Id: Ic6d7fb1b3c7951ff98c4fa84028450f0b2ba13fa
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>
|
|
|
|
|
|
|
| |
This test has been always passing in the last 10 runs.
Change-Id: Ic867f786104f118008cf810df21ac6e68438c881
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The fileLineEndingTest case doesn't test network in any way and it is
conceptually wrong, too, as any tests where line endings are an issue
should be handled with .gitattributes rather than forcing user to
check out the repo with unix line endings.
Task-number: QTBUG-24271
Change-Id: I73986993edc227cb68b8f61d51cc1cf458d20989
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
(cherry picked from commit fc8f92106d6743d4165de7d8a440b7e5dbd14391)
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
| |
This test only fails on Windows at the moment, so enabling it for
all the othe platforms.
Change-Id: Ic85e321a369104c590f71e45891ddede208383fb
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
| |
Significantly increase most timeouts.
Change-Id: I3c25692d1e26ae3efd301df2f02089e57a8708d3
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>
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The bearer startup code I added to some of the network autotests to
ensure the network was up before testing caused test failures on some
linux configurations due to there being no default network defined.
I've changed it to follow these steps:
1. update the configuration list & wait for update completed signal
- due to the polling engines not having any config defined on the first
run before the initial poll happens
2. check default configuration is valid before attempting to start it
3a. for valid configuration, start it and wait for started as before
3b. for invalid configuration, fail if bearer is mandatory, otherwise ignore
- on symbian bearer use is "mandatory", on desktop platforms it is optional
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
The frox ftp proxy closes connections using TCP RST instead of a normal
TCP FIN. On symbian, this causes the received but unacknowledged
preceding packet to be discarded (the "221 Goodbye" ftp response).
As QNAM and QFTP don't care about this, the network self test won't
either. (only for symbian, as windows and unix TCP/IP stacks retain
the unacknowledged packet in the receive queue)
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
| |
Start default bearer when running network self test
Fix typo in qnetworkreply test
Reviewed-by: Markus Goetz
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
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
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changed deployment in the .pro file from = to += so that the default
executable deployment is not removed.
Also added required symbian capabilities
Reviewed-by: Markus Goetz
|
|/ /
| |
| |
| |
| |
| | |
fread() used in the wrong way so test failed on Windows.
Reviewed-by: Markus Goetz
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|\| |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The logic here was the opposite from what was intended.
Note that this bug was hidden under normal circumstances when running
the entire testcase. It only appeared when one of the following was
true: (1) httpProxy or socks5Proxy was run on its own, or (2) the
dnsResolution test failed.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
src/gui/text/qtextlayout.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/configure/configureapp.cpp
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
| |
We want all our auto test machines to have OpenSSL.
Reviewed-by: Peter Hartmann
|
|
|
|
|
| |
Reviewed-by: Liang QI
Reviewed-by: Aleksandar Sasha Babic
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/networkselftest/tst_networkselftest.cpp
|
| | |
|
| |
| |
| |
| |
| |
| | |
firewall issue
Also check if we're not timing out instead of being able to fail.
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit ee51f0ee63fe5c6388cea1a1043963303ee3810b.
The selftest should "see" the git settings as they are to detect
if they are wrong on CRLF platforms.
Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| | |
added file to preserver the correct line endings for the test file
Reviewed-by: Aleksandar Babic
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some network tests depend on reading file and comparing it with
data fetched from network. On Windows, if not set properly, git will
append CRLF when checking out. This makes tests to fail as sizes and
binary content are not as expected.
Reviewed-by: Janne Anttila
|