diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-12 15:33:33 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-12 15:33:33 +0100 |
| commit | 437e83e7707516129f68ee26aca5349845b7cc7b (patch) | |
| tree | 0d4c8721f21acc5398e4eabff88a902cb23d0521 /tests/auto/qscriptvalue/tst_qscriptvalue.h | |
| parent | 7b3880475d02bd3db630387bccccc7e1ef9d4e9a (diff) | |
| parent | e61071a2a170eaeb524778e9e903100323b88bbe (diff) | |
| download | qt4-tools-437e83e7707516129f68ee26aca5349845b7cc7b.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
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
Diffstat (limited to 'tests/auto/qscriptvalue/tst_qscriptvalue.h')
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.h b/tests/auto/qscriptvalue/tst_qscriptvalue.h index c6b2202ae1..7bf0b66f18 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.h +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.h @@ -136,6 +136,7 @@ private slots: void getSetData_objects(); void getSetData_nonObjects_data(); void getSetData_nonObjects(); + void setData_QTBUG15144(); void getSetScriptClass_emptyClass_data(); void getSetScriptClass_emptyClass(); void getSetScriptClass_JSObjectFromCpp(); @@ -165,6 +166,7 @@ private slots: void nestedObjectToVariant_data(); void nestedObjectToVariant(); + private: void newEngine() { |