Commit 01335edc authored by Friedemann Kleint's avatar Friedemann Kleint

Fix export symbols for QtDeclarative and QtQuick1.

Fix build on Windows and compiler warnings.

Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.

Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 20c3575f
......@@ -40,9 +40,9 @@
#include <QtDeclarative/QDeclarativeExtensionPlugin>
#include <QtDeclarative/qdeclarative.h>
#include <QtGui/QGraphicsProxyWidget>
#include <QtGui/QPushButton>
#include <QDebug>
#include <QtWidgets/QGraphicsProxyWidget>
#include <QtWidgets/QPushButton>
#include <QtCore/QDebug>
class MyPushButton : public QGraphicsProxyWidget
{
......
TEMPLATE = lib
CONFIG += qt plugin
QT += declarative
QT += widgets declarative
DESTDIR = QWidgets
TARGET = qmlqwidgetsplugin
......
......@@ -39,7 +39,7 @@
**
****************************************************************************/
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include <QtQuick1/QDeclarativeView>
#include <QtDeclarative/QDeclarativeContext>
#include <QtDeclarative/QDeclarativeEngine>
......
TEMPLATE = app
TARGET = minehunt
QT += declarative qtquick1
QT += declarative qtquick1 widgets
# Input
HEADERS += minehunt.h
......
......@@ -44,7 +44,7 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qscopedpointer.h>
#include <QtGui/qapplication.h>
#include <QtGui/QGuiApplication>
#include <QtDeclarative/qjsengine.h>
......@@ -95,7 +95,7 @@ static void interactive(QJSEngine *eng)
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
QGuiApplication app(argc, argv);
QScopedPointer<QJSEngine> eng(new QJSEngine());
{
QJSValue globalObject = eng->globalObject();
......@@ -150,4 +150,4 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
#include <main.moc>
\ No newline at end of file
#include <main.moc>
......@@ -12,6 +12,6 @@ QT.qmltest.libs = $$QT_MODULE_LIB_BASE
QT.qmltest.plugins = $$QT_MODULE_PLUGIN_BASE
QT.qmltest.imports = $$QT_MODULE_IMPORT_BASE
QT.qmltest.depends = declarative testlib
QT.qmltest.DEFINES = QT_DECLARATIVE_LIB
QT.qmltest.DEFINES = QT_QMLTEST_LIB
QT_CONFIG += qmltest
......@@ -12,6 +12,6 @@ QT.qtquick1.libs = $$QT_MODULE_LIB_BASE
QT.qtquick1.plugins = $$QT_MODULE_PLUGIN_BASE
QT.qtquick1.imports = $$QT_MODULE_IMPORT_BASE
QT.qtquick1.depends = declarative
QT.qtquick1.DEFINES = QT_DECLARATIVE_LIB
QT.qtquick1.DEFINES = QT_QTQUICK1_LIB
QT_CONFIG += qtquick1
......@@ -75,6 +75,7 @@
#include <limits>
#include <stdint.h>
#include <time.h>
#include <math.h>
//#if HAVE(SYS_TIME_H)
#if defined(EXISTS_SYS_TIME)
......@@ -340,11 +341,15 @@ static const struct KnownZone {
double timeClip(double t)
{
if (!isfinite(t))
return NaN;
if (fabs(t) > maxECMAScriptTime)
#if defined(_MSC_VER)
if (!_finite(t) || fabs(t) > maxECMAScriptTime)
return NaN;
return t >= 0 ? floor(t) : ceil(t);
#else
if (!isfinite(t) || fabs(t) > maxECMAScriptTime)
return NaN;
return trunc(t);
#endif
}
} // namespace WTF
......
......@@ -264,7 +264,7 @@ QString QSGCanvasItem::toDataURL(const QString& mimeType) const
image.save(&buffer, type.toAscii());
buffer.close();
QString dataUrl = QLatin1String("data:%1;base64,%2");
return dataUrl.arg(mime).arg(ba.toBase64().constData());
return dataUrl.arg(mime).arg(QString::fromAscii(ba.toBase64()));
}
return QLatin1String("data:,");
}
......
......@@ -546,6 +546,7 @@ static v8::Handle<v8::Value> ctx2d_valid(v8::Local<v8::String>, const v8::Access
QV8Engine *engine = V8ENGINE_ACCESSOR();
Q_UNUSED(engine)
return v8::Boolean::New(r->context->valid());
}
......
......@@ -58,7 +58,8 @@
QT_BEGIN_NAMESPACE
class QSGCanvasItem;
struct QSGContext2DWorkerAgent {
class QSGContext2DWorkerAgent {
public:
QSGContext2DWorkerAgent()
:ref(1)
, orig(0)
......
......@@ -252,7 +252,7 @@ void QSGCanvas::exposeEvent(QExposeEvent *)
d->thread->paint();
}
void QSGCanvas::resizeEvent(QResizeEvent *e)
void QSGCanvas::resizeEvent(QResizeEvent *)
{
Q_D(QSGCanvas);
d->thread->resize(size());
......@@ -268,7 +268,7 @@ void QSGCanvas::animationStopped()
d_func()->thread->animationStopped();
}
void QSGCanvas::showEvent(QShowEvent *e)
void QSGCanvas::showEvent(QShowEvent *)
{
Q_D(QSGCanvas);
if (d->vsyncAnimations) {
......@@ -286,7 +286,7 @@ void QSGCanvas::showEvent(QShowEvent *e)
}
}
void QSGCanvas::hideEvent(QHideEvent *e)
void QSGCanvas::hideEvent(QHideEvent *)
{
Q_D(QSGCanvas);
d->thread->stopRendering();
......
......@@ -126,7 +126,8 @@ static void qt_sgitems_defineModule(const char *uri, int major, int minor)
qmlRegisterType<QDeclarativePathPercent>(uri,major,minor,"PathPercent");
qmlRegisterType<QDeclarativePathQuad>(uri,major,minor,"PathQuad");
qmlRegisterType<QSGPathView>(uri,major,minor,"PathView");
qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner","Positioner is an abstract type that is only available as an attached property.");
qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner",
QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
#ifndef QT_NO_VALIDATOR
qmlRegisterType<QIntValidator>(uri,major,minor,"IntValidator");
qmlRegisterType<QDoubleValidator>(uri,major,minor,"DoubleValidator");
......
......@@ -417,7 +417,7 @@ void QSGShaderEffect::setSource(const QVariant &var, int index)
QSGItem *item = qobject_cast<QSGItem *>(obj);
if (!item || !item->isTextureProvider()) {
qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]",
qPrintable(source.name), qPrintable(obj->objectName()), obj->metaObject()->className());
source.name.constData(), qPrintable(obj->objectName()), obj->metaObject()->className());
return;
}
......
......@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
QWidgetPrivate *qt_widget_private(QWidget *widget);
Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget);
/*!
\qmlclass TextEdit QSGTextEdit
\inqmlmodule QtQuick 2
......
......@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
QWidgetPrivate *qt_widget_private(QWidget *widget);
Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget);
/*!
\qmlclass TextInput QSGTextInput
......
......@@ -102,7 +102,7 @@ QSGAngledDirection::QSGAngledDirection(QObject *parent) :
}
const QPointF &QSGAngledDirection::sample(const QPointF &from)
const QPointF &QSGAngledDirection::sample(const QPointF &)
{
//TODO: Faster
qreal theta = m_angle*CONV - m_angleVariation*CONV + rand()/float(RAND_MAX) * m_angleVariation*CONV * 2;
......
......@@ -61,10 +61,10 @@ QDeclarativeListProperty<QSGStochasticDirection> QSGCumulativeDirection::directi
const QPointF &QSGCumulativeDirection::sample(const QPointF &from)
{
QPointF ret;
m_ret = QPointF();
foreach (QSGStochasticDirection* dir, m_directions)
ret += dir->sample(from);
return ret;
m_ret += dir->sample(from);
return m_ret;
}
QT_END_NAMESPACE
......@@ -60,5 +60,6 @@ public:
const QPointF &sample(const QPointF &from);
private:
QList<QSGStochasticDirection*> m_directions;
QPointF m_ret;
};
#endif // QSGCUMULATIVEDIRECTION_P_H
......@@ -281,7 +281,7 @@ void QSGCustomParticle::setSource(const QVariant &var, int index)
source.item = qobject_cast<QSGItem *>(obj);
if (!source.item || !source.item->isTextureProvider()) {
qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]",
qPrintable(source.name), qPrintable(obj->objectName()), obj->metaObject()->className());
source.name.constData(), qPrintable(obj->objectName()), obj->metaObject()->className());
return;
}
......
......@@ -209,7 +209,7 @@ void QSGFollowEmitter::emitWindow(int timeStamp)
const QPointF &speed = m_speed->sample(newPos);
datum->vx = speed.x()
+ m_speed_from_movement * d->vx;
datum->vy = speed.y();
datum->vy = speed.y()
+ m_speed_from_movement * d->vy;
// Particle acceleration
......
......@@ -66,7 +66,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlParticlesDebug, QML_PARTICLES_DEBUG)
//TODO: Make it larger on desktop? Requires fixing up shader code with the same define
#define UNIFORM_ARRAY_SIZE 64
const float CONV = 0.017453292519943295;
const qreal CONV = 0.017453292519943295;
class ImageMaterialData
{
public:
......@@ -99,13 +99,13 @@ class TabledMaterial : public QSGSimpleMaterialShader<TabledMaterialData>
public:
TabledMaterial()
{
QFile vf(":defaultshaders/imagevertex.shader");
QFile vf(QStringLiteral(":defaultshaders/imagevertex.shader"));
vf.open(QFile::ReadOnly);
m_vertex_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define TABLE\n#define DEFORM\n#define COLOR\n")
+ vf.readAll();
QFile ff(":defaultshaders/imagefragment.shader");
QFile ff(QStringLiteral(":defaultshaders/imagefragment.shader"));
ff.open(QFile::ReadOnly);
m_fragment_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define TABLE\n#define DEFORM\n#define COLOR\n")
......@@ -167,13 +167,13 @@ class DeformableMaterial : public QSGSimpleMaterialShader<DeformableMaterialData
public:
DeformableMaterial()
{
QFile vf(":defaultshaders/imagevertex.shader");
QFile vf(QStringLiteral(":defaultshaders/imagevertex.shader"));
vf.open(QFile::ReadOnly);
m_vertex_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define DEFORM\n#define COLOR\n")
+ vf.readAll();
QFile ff(":defaultshaders/imagefragment.shader");
QFile ff(QStringLiteral(":defaultshaders/imagefragment.shader"));
ff.open(QFile::ReadOnly);
m_fragment_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define DEFORM\n#define COLOR\n")
......@@ -223,13 +223,13 @@ class SpriteMaterial : public QSGSimpleMaterialShader<SpriteMaterialData>
public:
SpriteMaterial()
{
QFile vf(":defaultshaders/imagevertex.shader");
QFile vf(QStringLiteral(":defaultshaders/imagevertex.shader"));
vf.open(QFile::ReadOnly);
m_vertex_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define SPRITE\n#define TABLE\n#define DEFORM\n#define COLOR\n")
+ vf.readAll();
QFile ff(":defaultshaders/imagefragment.shader");
QFile ff(QStringLiteral(":defaultshaders/imagefragment.shader"));
ff.open(QFile::ReadOnly);
m_fragment_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define SPRITE\n#define TABLE\n#define DEFORM\n#define COLOR\n")
......@@ -296,13 +296,13 @@ class ColoredMaterial : public QSGSimpleMaterialShader<ColoredMaterialData>
public:
ColoredMaterial()
{
QFile vf(":defaultshaders/imagevertex.shader");
QFile vf(QStringLiteral(":defaultshaders/imagevertex.shader"));
vf.open(QFile::ReadOnly);
m_vertex_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define COLOR\n")
+ vf.readAll();
QFile ff(":defaultshaders/imagefragment.shader");
QFile ff(QStringLiteral(":defaultshaders/imagefragment.shader"));
ff.open(QFile::ReadOnly);
m_fragment_code = QByteArray(SHADER_DEFINES)
+ QByteArray("#define COLOR\n")
......@@ -317,7 +317,7 @@ public:
void activate() {
QSGSimpleMaterialShader<ColoredMaterialData>::activate();
#ifndef QT_OPENGL_ES_2
#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
glEnable(GL_POINT_SPRITE);
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
#endif
......@@ -325,7 +325,7 @@ public:
void deactivate() {
QSGSimpleMaterialShader<ColoredMaterialData>::deactivate();
#ifndef QT_OPENGL_ES_2
#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
glDisable(GL_POINT_SPRITE);
glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
#endif
......@@ -367,12 +367,12 @@ class SimpleMaterial : public QSGSimpleMaterialShader<SimpleMaterialData>
public:
SimpleMaterial()
{
QFile vf(":defaultshaders/imagevertex.shader");
QFile vf(QStringLiteral(":defaultshaders/imagevertex.shader"));
vf.open(QFile::ReadOnly);
m_vertex_code = QByteArray(SHADER_DEFINES)
+ vf.readAll();
QFile ff(":defaultshaders/imagefragment.shader");
QFile ff(QStringLiteral(":defaultshaders/imagefragment.shader"));
ff.open(QFile::ReadOnly);
m_fragment_code = QByteArray(SHADER_DEFINES)
+ ff.readAll();
......@@ -386,7 +386,7 @@ public:
void activate() {
QSGSimpleMaterialShader<SimpleMaterialData>::activate();
#ifndef QT_OPENGL_ES_2
#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
glEnable(GL_POINT_SPRITE);
glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
#endif
......@@ -394,7 +394,7 @@ public:
void deactivate() {
QSGSimpleMaterialShader<SimpleMaterialData>::deactivate();
#ifndef QT_OPENGL_ES_2
#if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
glDisable(GL_POINT_SPRITE);
glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
#endif
......@@ -913,7 +913,7 @@ QSGGeometryNode* QSGImageParticle::buildParticleNodes()
sizetable = QImage(m_sizetable_name.toLocalFile());
opacitytable = QImage(m_opacitytable_name.toLocalFile());
if (colortable.isNull())
colortable = QImage(":defaultshaders/identitytable.png");
colortable = QImage(QStringLiteral(":defaultshaders/identitytable.png"));
Q_ASSERT(!colortable.isNull());
getState<ImageMaterialData>(m_material)->colorTable = sceneGraphEngine()->createTextureFromImage(colortable);
fillUniformArrayFromImage(getState<ImageMaterialData>(m_material)->sizeTable, sizetable, UNIFORM_ARRAY_SIZE);
......
......@@ -213,7 +213,7 @@ void QSGModelParticle::processPending()
m_requests.clear();
}
void QSGModelParticle::commit(int gIdx, int pIdx)
void QSGModelParticle::commit(int /* gIdx */, int /* pIdx */)
{
//No-op unless we start copying the data.
}
......
......@@ -493,7 +493,7 @@ QSGParticleSystem::QSGParticleSystem(QSGItem *parent) :
{
QSGParticleGroupData* gd = new QSGParticleGroupData(0, this);//Default group
m_groupData.insert(0,gd);
m_groupIds.insert("",0);
m_groupIds.insert(QString(),0);
m_nextGroupId = 1;
connect(&m_painterMapper, SIGNAL(mapped(QObject*)),
......@@ -549,7 +549,7 @@ void QSGParticleSystem::loadPainter(QObject *p)
int particleCount = 0;
if (painter->particles().isEmpty()){//Uses default particle
QStringList def;
def << "";
def << QString();
painter->setParticles(def);
particleCount += m_groupData[0]->size();
m_groupData[0]->painters << painter;
......
......@@ -58,7 +58,8 @@
QT_BEGIN_NAMESPACE
class QDeclarativePool
// Exported for QtQuick1
class Q_DECLARATIVE_EXPORT QDeclarativePool
{
public:
// The class has a destructor that needs to be called
......
......@@ -122,7 +122,7 @@ public:
QByteArray toData() const { return m_data; }
static void fromData(QMetaObject *, const QMetaObject *parent, const QByteArray &);
private:
friend class StringRef;
friend struct StringRef;
QByteArray m_data;
int m_zeroPtr;
......
......@@ -254,7 +254,7 @@ public:
}
};
struct Q_AUTOTEST_EXPORT QStringHashData
class Q_AUTOTEST_EXPORT QStringHashData
{
public:
QStringHashData()
......@@ -275,7 +275,7 @@ private:
};
template<class T, int SmallThreshold = 0>
class Q_AUTOTEST_EXPORT QStringHash
class QStringHash
{
public:
struct Node : public QStringHashNode {
......
......@@ -58,7 +58,9 @@
QT_BEGIN_NAMESPACE
class QDeclarativeEngine;
class QDeclarativeCleanup
// Exported for QtQuick1
class Q_DECLARATIVE_EXPORT QDeclarativeCleanup
{
public:
QDeclarativeCleanup(QDeclarativeEngine *);
......
......@@ -1595,7 +1595,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeScript::Property *prop,
QDeclarativePropertyCache::Data defaultPropertyData;
defaultPropertyData.load(p, engine);
if (p.name())
prop->setName(p.name());
prop->setName(QLatin1String(p.name()));
prop->core = defaultPropertyData;
prop->index = prop->core.coreIndex;
}
......@@ -2406,7 +2406,7 @@ const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) con
int QDeclarativeCompiler::rewriteBinding(const QString& expression, const QString& name)
{
QDeclarativeRewrite::RewriteBinding rewriteBinding;
rewriteBinding.setName(QLatin1Char('$') + name.mid(name.lastIndexOf('.') + 1));
rewriteBinding.setName(QLatin1Char('$') + name.mid(name.lastIndexOf(QLatin1Char('.')) + 1));
QString rewrite = rewriteBinding(expression, 0, 0);
......
......@@ -210,7 +210,7 @@ void QDeclarativeImports::populateCache(QDeclarativeTypeNameCache *cache, QDecla
if (module)
import.modules.append(QDeclarativeTypeModuleVersion(module, data.minversion));
QDeclarativeMetaType::ModuleApi moduleApi = QDeclarativeMetaType::moduleApi(data.uri.toUtf8(), data.majversion, data.minversion);
QDeclarativeMetaType::ModuleApi moduleApi = QDeclarativeMetaType::moduleApi(data.uri, data.majversion, data.minversion);
if (moduleApi.script || moduleApi.qobject) {
QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
QDeclarativeMetaType::ModuleApiInstance *a = ep->moduleApiInstances.value(moduleApi);
......
......@@ -71,7 +71,8 @@ class QDeclarativeImportsPrivate;
class QDeclarativeImportDatabase;
class QDeclarativeTypeLoader;
class QDeclarativeImports
// Exported for QtQuick1
class Q_DECLARATIVE_EXPORT QDeclarativeImports
{
public:
QDeclarativeImports(QDeclarativeTypeLoader *);
......
......@@ -132,7 +132,8 @@ QDeclarativeInfo::~QDeclarativeInfo()
marker = typeName.indexOf(QLatin1String("_QML_"));
if (marker != -1) {
typeName = typeName.left(marker) + "*";
typeName = typeName.left(marker);
typeName += QLatin1Char('*');
type = QDeclarativeMetaType::qmlType(QMetaType::type(typeName.toLatin1()));
if (type) {
typeName = QLatin1String(type->qmlTypeName());
......
......@@ -72,7 +72,7 @@ QT_MODULE(Declarative)
class QByteArray;
class QDeclarativePropertyCache;
namespace QDeclarativeJS { namespace AST { class Node; class StringLiteral; } }
namespace QDeclarativeCompilerTypes { class BindingReference; class ComponentCompileState; }
namespace QDeclarativeCompilerTypes { struct BindingReference; struct ComponentCompileState; }
namespace QDeclarativeScript {
......
......@@ -145,7 +145,7 @@ public:
bool forwardOnly; // type == Rows
};
static v8::Handle<v8::Value> qmlsqldatabase_version(v8::Local<v8::String> property, const v8::AccessorInfo& info)
static v8::Handle<v8::Value> qmlsqldatabase_version(v8::Local<v8::String> /* property */, const v8::AccessorInfo& info)
{
QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(info.This());
if (!r || r->type != QV8SqlDatabaseResource::Database)
......@@ -154,7 +154,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_version(v8::Local<v8::String> proper
return r->engine->toString(r->version);
}
static v8::Handle<v8::Value> qmlsqldatabase_rows_length(v8::Local<v8::String> property, const v8::AccessorInfo& info)
static v8::Handle<v8::Value> qmlsqldatabase_rows_length(v8::Local<v8::String> /* property */, const v8::AccessorInfo& info)
{
QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(info.This());
if (!r || r->type != QV8SqlDatabaseResource::Rows)
......@@ -172,7 +172,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_rows_length(v8::Local<v8::String> pr
return v8::Integer::New(s);
}
static v8::Handle<v8::Value> qmlsqldatabase_rows_forwardOnly(v8::Local<v8::String> property,
static v8::Handle<v8::Value> qmlsqldatabase_rows_forwardOnly(v8::Local<v8::String> /* property */,
const v8::AccessorInfo& info)
{
QV8SqlDatabaseResource *r = v8_resource_cast<QV8SqlDatabaseResource>(info.This());
......@@ -182,7 +182,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_rows_forwardOnly(v8::Local<v8::Strin
return v8::Boolean::New(r->query.isForwardOnly());
}
static void qmlsqldatabase_rows_setForwardOnly(v8::Local<v8::String> property,
static void qmlsqldatabase_rows_setForwardOnly(v8::Local<v8::String> /* property */,
v8::Local<v8::Value> value,
const v8::AccessorInfo& info)
{
......@@ -568,7 +568,7 @@ void *qt_add_qmlsqldatabase(QV8Engine *engine)
return (void *)new QDeclarativeSqlDatabaseData(engine);
}
void qt_rem_qmlsqldatabase(QV8Engine *engine, void *d)
void qt_rem_qmlsqldatabase(QV8Engine * /* engine */, void *d)
{
QDeclarativeSqlDatabaseData *data = (QDeclarativeSqlDatabaseData *)d;
delete data;
......
......@@ -77,7 +77,8 @@ class QDeclarativeComponentPrivate;
class QDeclarativeTypeData;
class QDeclarativeDataLoader;
class Q_AUTOTEST_EXPORT QDeclarativeDataBlob : public QDeclarativeRefCount
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDataBlob : public QDeclarativeRefCount
{
public:
enum Status {
......@@ -160,7 +161,8 @@ private:
QList<QDeclarativeError> m_errors;
};
class Q_AUTOTEST_EXPORT QDeclarativeDataLoader : public QObject
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDataLoader : public QObject
{
Q_OBJECT
public:
......@@ -184,7 +186,8 @@ private:
NetworkReplies m_networkReplies;
};
class Q_AUTOTEST_EXPORT QDeclarativeTypeLoader : public QDeclarativeDataLoader
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTypeLoader : public QDeclarativeDataLoader
{
Q_OBJECT
public:
......
......@@ -105,7 +105,8 @@ private:
QDeclarativeValueType *valueTypes[QVariant::UserType - 1];
};
class Q_AUTOTEST_EXPORT QDeclarativePointFValueType : public QDeclarativeValueType
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePointFValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal x READ x WRITE setX)
Q_PROPERTY(qreal y READ y WRITE setY)
......@@ -129,7 +130,8 @@ private:
QPointF point;
};
class Q_AUTOTEST_EXPORT QDeclarativePointValueType : public QDeclarativeValueType
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePointValueType : public QDeclarativeValueType
{
Q_PROPERTY(int x READ x WRITE setX)
Q_PROPERTY(int y READ y WRITE setY)
......@@ -153,7 +155,8 @@ private:
QPoint point;
};
class Q_AUTOTEST_EXPORT QDeclarativeSizeFValueType : public QDeclarativeValueType
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeSizeFValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal width READ width WRITE setWidth)
Q_PROPERTY(qreal height READ height WRITE setHeight)
......@@ -177,7 +180,8 @@ private:
QSizeF size;
};
class Q_AUTOTEST_EXPORT QDeclarativeSizeValueType : public QDeclarativeValueType
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeSizeValueType : public QDeclarativeValueType
{
Q_PROPERTY(int width READ width WRITE setWidth)
Q_PROPERTY(int height READ height WRITE setHeight)
......@@ -201,7 +205,8 @@ private:
QSize size;
};
class Q_AUTOTEST_EXPORT QDeclarativeRectFValueType : public QDeclarativeValueType
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectFValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal x READ x WRITE setX)
Q_PROPERTY(qreal y READ y WRITE setY)
......@@ -232,7 +237,8 @@ private:
QRectF rect;
};
class Q_AUTOTEST_EXPORT QDeclarativeRectValueType : public QDeclarativeValueType
// Exported for QtQuick1
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectValueType : public QDeclarativeValueType
{
Q_PROPERTY(int x READ x WRITE setX)
Q_PROPERTY(int y READ y WRITE setY)
......@@ -263,7 +269,7 @@ private:
QRect rect;
};
class Q_AUTOTEST_EXPORT QDeclarativeVector2DValueType : public QDeclarativeValueType
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeVector2DValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal x READ x WRITE setX)
Q_PROPERTY(qreal y READ y WRITE setY)
......@@ -287,7 +293,7 @@ private:
QVector2D vector;
};
class Q_AUTOTEST_EXPORT QDeclarativeVector3DValueType : public QDeclarativeValueType
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeVector3DValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal x READ x WRITE setX)
Q_PROPERTY(qreal y READ y WRITE setY)
......@@ -314,7 +320,7 @@ private:
QVector3D vector;
};
class Q_AUTOTEST_EXPORT QDeclarativeVector4DValueType : public QDeclarativeValueType
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeVector4DValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal x READ x WRITE setX)
Q_PROPERTY(qreal y READ y WRITE setY)
......@@ -344,7 +350,7 @@ private:
QVector4D vector;
};
class Q_AUTOTEST_EXPORT QDeclarativeQuaternionValueType : public QDeclarativeValueType
class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeQuaternionValueType : public QDeclarativeValueType
{
Q_PROPERTY(qreal scalar READ scalar WRITE setScalar)