| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
It is not allowed to mix values that were created in different
QScriptEngine instances.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| | |
Reviewed-by: Kent Hansen
|
| |
| |
| |
| | |
Reviewed-by: Kent Hansen
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Yet another missing API shim.
When converting the QScriptValue to JSC, a JSCell may be allocated,
which can cause the GC to trigger.
If an identifier (JSC::Identifier) is then garbage collected, the
destructor will try to remove itself from the currentIdentifierTable().
Because the API shim was missing, the identifier table was 0.
It's difficult to create a bulletproof test for this case, but the
attached test is a best effort (it crashes on my machine without the
fix).
Task-number: QTBUG-15144
Reviewed-by: Jedrzej Nowacki
|
| |
| |
| |
| |
| |
| | |
Currently it's possible to set the prototype to be any value,
but this doesn't make sense; see QTBUG-15154.
Mark test as expected failure until it's fixed.
|
| |
| |
| |
| |
| |
| |
| | |
The test was testing too much. Split them into more manageable
chunks.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test was divided into two separate cases, it should reduce
maintenance costs.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test was divided into separate cases, it should reduce maintenance
costs.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| | |
The test was too complex, it was splited.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test should use _data function. The test was divided into two
separate cases, it should reduce maintenance costs.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test should use _data function. It should be easier to maintain that
code.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test should use _data function. It should be easier to maintain that
code.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test should use _data function. It should be easier to maintain that
code.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test should _data function. It should be easier to maintain that
code.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| | |
Few bound QScriptValue instances were added to the test.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| |
| | |
Remove unused suffix "_old" from test cases. The suffix was used to
differentiate between a generated test and a standard one. As they are
separated now it is not needed anymore.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| | |
QScriptValue test suit was way too big, so it was difficult to maintain.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| | |
The test was too big. More data was added to the part testing non Object
behaviour.
Reviewed-by: Kent Hansen
|
|/
|
|
|
|
| |
The test was too big. There should be no difference in coverage.
Reviewed-by: Kent Hansen
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If an exception occurs, we should ignore the result of
JSC::construct() and return the exception value, even if
the exception is not an object.
This makes the behavior match the documentation: "Calling
construct() can cause an exception to occur in the script
engine; in that case, construct() returns the value that
was thrown".
Task-number: QTBUG-14801
Reviewed-by: Jedrzej Nowacki
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
For arrays, the conversion would crash if the array was cyclic.
Introduce a set that keeps track of which objects are being
converted, and return an empty list when a cycle is detected.
For other types of objects, the object was previously attempted
to be converted to a primitive, which typically meant you would
get the string representation ("[object Object]"), since most
(practically all) objects can be converted to a string -- not
useful at all.
Change the conversion so it converts the object to a QVariantMap
instead. This was already done for slots that took a QVariantMap
as argument, but only one level deep. Make the conversion recursive,
using the same mechanism as for arrays to detect cycles.
This change also means that you get a meaningful
JS object => QVariant => JS object roundtrip.
It also aligns the behavior with the Qt WebKit bridge.
Update the documentation to describe the new behavior.
The 4.7 changelog will also be updated under "important behavioral
changes".
This change exposed an issue with one of the QML autotests: A JS
object was assigned to a QVariant property, which caused it to be
converted to a string (rather than a QVariantMap) -- just shows
that the previous behavior was unintuitive). Later, this variant
property is compared to another object, the intention being to
compare the _properties_ of the two objects; but because the variant
property contained a string, this would cause the other operand
(object) to be converted to a string as well ("[object Object]"),
causing a meaningless test pass.
Change the test to deserialize both objects using JSON.stringify,
and compare the resulting strings, so that actual
JS object => QVariant(Map) => JS object roundtrip is tested (the
intention).
Task-number: QTBUG-3511
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The QScriptValue autotest suite compiles about 24 min with MSVS2008,
which is unacceptable.
Tests were splited into a few files for better use of distributed
compilation.
Repeated calls to insert() and operator<<() where replaced by loops,
that should reduce time of code optimizing.
Reviewed-by: Kent Hansen
|
|
|
|
|
|
|
| |
The test suite was updated after changes in dataset of autotest
generator. New test were added: isVariant, isQMetaObject and isQObject.
Reviewed-by: Kent Hansen
|
|
tst_qscriptvalue_generated.cpp was generated by Jedrzej's generator
(see testgen subdirectory).
The idea is that the old isXXX and toXXX tests will be replaced entirely
by the auto-generated versions, but we keep them for now (with "_old"
suffix) until we are sure that the auto-generated versions cover everything.
|