[Qt] qwebframe auto test doesn't compile

[Samuel Nevala]

Qt: http://qt.gitorious.org/+qt-s60-developers/qt/qt-s60
branch: 4.7
sha: b1225b83282bdeaf7c3847a8f2b3d05e004ce198

Used qt contains webkit from:
webkit: git://gitorious.org/qtwebkit/qtwebkit.git
sha:3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2

Reproduce:
1. Fix Bug 38721 (or comment out CustomType)
2. cd qt\src\3rdparty\webkit\WebKit\qt\tests or qt\test\auto\qwebframe
3. qmake
4. make

Expected: auto tests compile

Result:
 FAILED win32simplelink for winscw_udeb.mwccinc: epoc32\release\winscw\udeb\tst_qwebframe.exe
  mmp: qwebframe\qwebframe_0xE1cb089e.mmp
   mwldsym2.exe: warning: Multiply defined symbol: ___get_MSL_init_count in
   mwldsym2.exe: warning: files uc_cwhelp.obj (eexe.lib), startup.win32.c.obj (msl_all_static_mse_symbian_d.lib),
   mwldsym2.exe: warning: keeping definition in startup.win32.c.obj
   mwldsym2.exe: warning: Multiply defined symbol: __CleanUpMSL in
   mwldsym2.exe: warning: files uc_cwhelp.obj (eexe.lib), startup.win32.c.obj (msl_all_static_mse_symbian_d.lib),
   mwldsym2.exe: warning: keeping definition in startup.win32.c.obj
   mwldsym2.exe: Undefined symbol: 'bool QTest::qCompare<class QObject *, class MyQObject *>(class QObject * const const &, class MyQObject * const const &, char const *, char const *, char const *, int) (?qCom
pare@?$@PAVQObject@@PAVMyQObject@@@QTest@@YA_NABQAV1@ABQAV2@PBD22H@Z)'
   mwldsym2.exe: referenced from 'void tst_QWebFrame::getSetStaticProperty(void) (?getSetStaticProperty@tst_QWebFrame@@AAEXXZ)' in tst_qwebframe.cpp:783

   Errors caused tool to abort.

[Samuel Nevala]

Fix:
------- src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp -------
index e3de123..d04a652 100644
@@ -780,7 +780,7 @@ void tst_QWebFrame::getSetStaticProperty()
         QCOMPARE(vm.size(), 3);
         QCOMPARE(vm.value("a").toInt(), 123);
         QCOMPARE(vm.value("b").toString(), QLatin1String("foo"));
-        QCOMPARE(vm.value("c").value<QObject*>(), m_myObject);
+        QCOMPARE(vm.value("c").value<QObject*>(), static_cast<QObject*>(m_myObject));
     }
     QCOMPARE(evalJS("myObject.variantMapProperty.a === 123"), sTrue);
     QCOMPARE(evalJS("myObject.variantMapProperty.b === 'foo'"), sTrue);

[Janne Koskinen]

Created attachment 56475 [details]
proper patch

This is known WINSCW issue that shows up a lot when doing calls where templated arguments
have same base class and parameters are passed with derived class types.

[WebKit Commit Bot]

Comment on attachment 56475 [details]
proper patch

Clearing flags on attachment: 56475

Committed r59838: <http://trac.webkit.org/changeset/59838>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Simon Hausmann]

Revision r59838 cherry-picked into qtwebkit-2.0 with commit 3342fab646f1e3054cb7a5dea9826c2b92905e8e