diff options
| author | Sami Rosendahl <ext-sami.1.rosendahl@nokia.com> | 2012-01-17 11:32:03 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 12:29:00 (GMT) |
| commit | b34d903466a34668973030341e2f12d2b481ed58 (patch) | |
| tree | 0e109761508b6595df94d0e70668b59f7f8e6084 /imports | |
| parent | 7288ea511d21c86d388507287ddb5e494bbab2a0 (diff) | |
| download | Qt-b34d903466a34668973030341e2f12d2b481ed58.zip Qt-b34d903466a34668973030341e2f12d2b481ed58.tar.gz Qt-b34d903466a34668973030341e2f12d2b481ed58.tar.bz2 | |
Fix failure of tst_QDBusMarshall::demarshallPrimitives()
Commit e20eaed5c1968e32eca97cf449fa588cfab35a5d was merged to Qt 4.8
although the originating merge request
https://qt.gitorious.org/qt/qt/merge_requests/1469 targeted Qt 4.7.
This resulted in test data setup and execution failure for test case
tst_QDBusMarshall::demarshallPrimitives() due to changes in the test in
Qt 4.8.
This commit refactors the sendBasic_data() test data function to support
separate initialization of basic numeric and basic string data to be
reused by demarshallPrimitives_data().
Same refactoring was done in Qt5 and this commit aligns Qt4.8 commit
e20eaed5c1968e32eca97cf449fa588cfab35a5d with Qt5.
Change-Id: I10d0fce34c99c7b3b6247c503634b55a93f7d3b2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'imports')
0 files changed, 0 insertions, 0 deletions