Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Symbian: Fix exporting and importing of some functions for autotests
  Symbian: Fix SRCDIR usage in qlayout autotest.
  Symbian: Fix qcssparser autotest
  Symbian: Fix qscriptextensionplugin autotest

20 files changed, 34 insertions, 19 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 9ea0b83..532af24 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -9509,7 +9509,7 @@ QVariant QGraphicsLineItem::extension(const QVariant &variant) const
     QPixmap::createHeuristicMask().  The performance and memory consumption
     is similar to MaskShape.
 */
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 
 class QGraphicsPixmapItemPrivate : public QGraphicsItemPrivate
 {
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index d2e21fb..4e6f916 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -1023,7 +1023,7 @@ void QGraphicsViewPrivate::freeStyleOptionsArray(QStyleOptionGraphicsItem *array
         delete [] array;
 }
 
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 
 /*!
     ### Adjustments in findItems: mapToScene(QRect) forces us to adjust the
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 6209e66..2c91f1d 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -654,7 +654,7 @@ QPolygonF QMatrix::map(const QPolygonF &a) const
     \sa QMatrix::map()
 */
 
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 
 /*!
     \fn QRegion QMatrix::map(const QRegion &region) const
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 72357a6..619dbdd 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -2663,7 +2663,7 @@ QRegion QPainter::clipRegion() const
     return region;
 }
 
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 
 /*!
     Returns the currently clip as a path. Note that the clip path is
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 958e499..2954190 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1231,7 +1231,7 @@ void QPdfBaseEngine::setupGraphicsState(QPaintEngine::DirtyFlags flags)
         setPen();
 }
 
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 
 void QPdfBaseEngine::updateClipPath(const QPainterPath &p, Qt::ClipOperation op)
 {
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 4d7b339..be263bb 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1454,7 +1454,7 @@ QPolygon QTransform::map(const QPolygon &a) const
     \sa QTransform::map()
 */
 
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 
 /*!
     \fn QRegion QTransform::map(const QRegion &region) const
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index aa4c014..cb6b2f6 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -52,7 +52,7 @@
 #endif
 
 QT_BEGIN_NAMESPACE
-extern int qt_defaultDpi();
+extern Q_GUI_EXPORT int qt_defaultDpi();
 QT_END_NAMESPACE
 
 class tst_qdeclarativevaluetypes : public QObject
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index fc3daa3..0600860 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -10,8 +10,11 @@ requires(contains(QT_CONFIG,private_tests))
 wince*|symbian: {
    addFiles.files = testdata
    addFiles.path = .
+   DEPLOYMENT += addFiles
+}
+wince* {
    timesFont.files = c:/windows/fonts/times.ttf
    timesFont.path = .
-   DEPLOYMENT += addFiles timesFont
+   DEPLOYMENT += timesFont
 }
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 9c51e02..27c8ced 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -648,7 +648,7 @@ void tst_QGL::getSetCheck()
 
 #ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
-extern QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString);
+extern Q_AUTOTEST_EXPORT QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString);
 QT_END_NAMESPACE
 #endif
 
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp
index 96f8863..be3998f 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/qlayout/tst_qlayout.cpp
@@ -60,6 +60,10 @@
 # include <QtGui/QMacStyle>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR "."
+#endif
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index 7296f34..148f355 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 extern void qt_x11_wait_for_window_manager(QWidget *w);
 #endif
 #if !defined(Q_WS_WIN)
-extern bool qt_tab_all_widgets;
+extern Q_GUI_EXPORT bool qt_tab_all_widgets;
 #endif
 QT_END_NAMESPACE
 
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index b36cf98..b5d8887 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -499,7 +499,7 @@ void tst_QPixmapCache::pixmapKey()
 }
 
 QT_BEGIN_NAMESPACE
-extern int q_QPixmapCache_keyHashSize();
+extern Q_AUTOTEST_EXPORT int q_QPixmapCache_keyHashSize();
 QT_END_NAMESPACE
 
 void tst_QPixmapCache::noLeak()
diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
index 5634285..7b7784c 100644
--- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -425,7 +425,7 @@ void tst_QPixmapFilter::dropShadowBoundingRectFor()
 }
 
 QT_BEGIN_NAMESPACE
-void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
+Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed);
 QT_END_NAMESPACE
 
 void tst_QPixmapFilter::blurIndexed8()
diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/qregion/tst_qregion.cpp
index bbc09c9..f06d848 100644
--- a/tests/auto/qregion/tst_qregion.cpp
+++ b/tests/auto/qregion/tst_qregion.cpp
@@ -977,7 +977,7 @@ void tst_QRegion::regionToPath_data()
 
 #ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
-extern QPainterPath qt_regionToPath(const QRegion &region);
+extern Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region);
 QT_END_NAMESPACE
 #endif
 
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index 14c204e..435b5e2 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -53,7 +53,7 @@ Q_DECLARE_METATYPE(QScriptValueList)
 Q_DECLARE_METATYPE(QScriptContext::Error)
 
 QT_BEGIN_NAMESPACE
-extern bool qt_script_isJITEnabled();
+extern Q_AUTOTEST_EXPORT bool qt_script_isJITEnabled();
 QT_END_NAMESPACE
 
 class tst_QScriptContext : public QObject
diff --git a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro
index e184ca4..e1701e3 100644
--- a/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro
+++ b/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro
@@ -7,4 +7,5 @@ DESTDIR = ../plugins/script
 
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
+    TARGET = qscriptextension_simpleplugin  # Too generic target causes conflict on Symbian
 }
diff --git a/tests/auto/qscriptextensionplugin/test/test.pro b/tests/auto/qscriptextensionplugin/test/test.pro
index 549bac2..223dafa 100644
--- a/tests/auto/qscriptextensionplugin/test/test.pro
+++ b/tests/auto/qscriptextensionplugin/test/test.pro
@@ -3,7 +3,14 @@ load(qttest_p4)
 QT = core script
 SOURCES = ../tst_qscriptextensionplugin.cpp
 CONFIG -= app_bundle
-LIBS += -L../plugins/script -lstaticplugin
+symbian {
+    LIBS += -lstaticplugin.lib
+    simplePlugin.files = qscriptextension_simpleplugin.dll
+    simplePlugin.path = plugins/script
+    DEPLOYMENT += simplePlugin
+} else {
+    LIBS += -L../plugins/script -lstaticplugin
+}
 
 TARGET = tst_qscriptextensionplugin
 CONFIG(debug_and_release) {
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index e350d1e..fc14dbc 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -666,7 +666,7 @@ void tst_QSvgRenderer::testGzLoading()
 
 #ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
-QByteArray qt_inflateGZipDataFrom(QIODevice *device);
+Q_AUTOTEST_EXPORT QByteArray qt_inflateGZipDataFrom(QIODevice *device);
 QT_END_NAMESPACE
 #endif
 
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 73d09f4..186623b 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -1968,7 +1968,7 @@ void tst_QTextEdit::setText()
 }
 
 QT_BEGIN_NAMESPACE
-extern void qt_setQtEnableTestFont(bool value);
+extern Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value);
 QT_END_NAMESPACE
 
 void tst_QTextEdit::fullWidthSelection_data()
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index 67d8269..68f93e1 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -174,7 +174,7 @@ void tst_QTextLayout::getSetCheck()
 }
 
 QT_BEGIN_NAMESPACE
-extern void qt_setQtEnableTestFont(bool value);
+extern Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value);
 QT_END_NAMESPACE
 
 tst_QTextLayout::tst_QTextLayout()
@@ -1109,7 +1109,7 @@ void tst_QTextLayout::tabsForRtl()
 }
 
 QT_BEGIN_NAMESPACE
-extern int qt_defaultDpiY();
+extern Q_GUI_EXPORT int qt_defaultDpiY();
 QT_END_NAMESPACE
 
 void tst_QTextLayout::testTabDPIScale()