Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend

Conflicts:
	src/script/api/qscriptable.cpp
	src/script/api/qscriptclasspropertyiterator.cpp
	src/script/api/qscriptcontext.cpp
	src/script/api/qscriptengine.h
	src/script/api/qscriptengineagent.cpp
	src/script/api/qscriptextensionplugin.cpp
	src/script/api/qscriptvalue.h
	src/script/api/qscriptvalueiterator.cpp
	src/script/parser/qscript.g
	src/script/parser/qscriptast.cpp
	src/script/parser/qscriptast_p.h
	src/script/parser/qscriptastvisitor_p.h
	src/script/parser/qscriptgrammar.cpp
	src/script/parser/qscriptgrammar_p.h
	src/script/parser/qscriptlexer.cpp
	src/script/parser/qscriptlexer_p.h
	src/script/parser/qscriptparser.cpp
	src/script/parser/qscriptparser_p.h
	src/script/parser/qscriptsyntaxchecker.cpp
	src/script/qscriptable.h
	src/script/qscriptable_p.h
	src/script/qscriptarray_p.h
	src/script/qscriptasm.cpp
	src/script/qscriptasm_p.h
	src/script/qscriptastfwd_p.h
	src/script/qscriptastvisitor.cpp
	src/script/qscriptbuffer_p.h
	src/script/qscriptclass.cpp
	src/script/qscriptclass.h
	src/script/qscriptclass_p.h
	src/script/qscriptclassdata.cpp
	src/script/qscriptclassdata_p.h
	src/script/qscriptclassinfo_p.h
	src/script/qscriptclasspropertyiterator.h
	src/script/qscriptclasspropertyiterator_p.h
	src/script/qscriptcompiler.cpp
	src/script/qscriptcompiler_p.h
	src/script/qscriptcontext.h
	src/script/qscriptcontext_p.cpp
	src/script/qscriptcontext_p.h
	src/script/qscriptcontextfwd_p.h
	src/script/qscriptcontextinfo.cpp
	src/script/qscriptcontextinfo.h
	src/script/qscriptcontextinfo_p.h
	src/script/qscriptecmaarray.cpp
	src/script/qscriptecmaarray_p.h
	src/script/qscriptecmaboolean.cpp
	src/script/qscriptecmaboolean_p.h
	src/script/qscriptecmacore.cpp
	src/script/qscriptecmacore_p.h
	src/script/qscriptecmadate.cpp
	src/script/qscriptecmadate_p.h
	src/script/qscriptecmaerror.cpp
	src/script/qscriptecmaerror_p.h
	src/script/qscriptecmafunction.cpp
	src/script/qscriptecmafunction_p.h
	src/script/qscriptecmaglobal.cpp
	src/script/qscriptecmaglobal_p.h
	src/script/qscriptecmamath.cpp
	src/script/qscriptecmamath_p.h
	src/script/qscriptecmanumber.cpp
	src/script/qscriptecmanumber_p.h
	src/script/qscriptecmaobject.cpp
	src/script/qscriptecmaobject_p.h
	src/script/qscriptecmaregexp.cpp
	src/script/qscriptecmaregexp_p.h
	src/script/qscriptecmastring.cpp
	src/script/qscriptecmastring_p.h
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptengine_p.h
	src/script/qscriptengineagent.h
	src/script/qscriptengineagent_p.h
	src/script/qscriptenginefwd_p.h
	src/script/qscriptextensioninterface.h
	src/script/qscriptextensionplugin.h
	src/script/qscriptextenumeration.cpp
	src/script/qscriptextenumeration_p.h
	src/script/qscriptextqobject.cpp
	src/script/qscriptextqobject_p.h
	src/script/qscriptextvariant.cpp
	src/script/qscriptextvariant_p.h
	src/script/qscriptfunction.cpp
	src/script/qscriptfunction_p.h
	src/script/qscriptgc_p.h
	src/script/qscriptglobals_p.h
	src/script/qscriptmember_p.h
	src/script/qscriptmemberfwd_p.h
	src/script/qscriptmemorypool_p.h
	src/script/qscriptnameid_p.h
	src/script/qscriptnodepool_p.h
	src/script/qscriptobject_p.h
	src/script/qscriptobjectdata_p.h
	src/script/qscriptobjectfwd_p.h
	src/script/qscriptrepository_p.h
	src/script/qscriptstring.cpp
	src/script/qscriptstring.h
	src/script/qscriptstring_p.h
	src/script/qscriptsyntaxchecker_p.h
	src/script/qscriptsyntaxcheckresult_p.h
	src/script/qscriptvalue.cpp
	src/script/qscriptvalue_p.h
	src/script/qscriptvaluefwd_p.h
	src/script/qscriptvalueimpl.cpp
	src/script/qscriptvalueimpl_p.h
	src/script/qscriptvalueimplfwd_p.h
	src/script/qscriptvalueiterator.h
	src/script/qscriptvalueiterator_p.h
	src/script/qscriptvalueiteratorimpl.cpp
	src/script/qscriptvalueiteratorimpl_p.h
	src/script/visitors/qscriptprettypretty.cpp
	src/script/visitors/qscriptprettypretty_p.h
	src/script/visitors/qscriptxmlgenerator.cpp
	src/script/visitors/qscriptxmlgenerator_p.h

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
index 618ddfc..bb2a959 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -114,7 +114,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout->setSpacing(6);
 #endif
-        vboxLayout->setMargin(11);
+        vboxLayout->setContentsMargins(11, 11, 11, 11);
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
         hboxLayout = new QHBoxLayout();
@@ -122,7 +122,7 @@ public:
         hboxLayout->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
@@ -150,7 +150,7 @@ public:
 #ifndef Q_OS_MAC
         ButtonGroup1->layout()->setSpacing(6);
 #endif
-        ButtonGroup1->layout()->setMargin(11);
+        ButtonGroup1->layout()->setContentsMargins(11, 11, 11, 11);
         vboxLayout1 = new QVBoxLayout();
         QBoxLayout *boxlayout = qobject_cast<QBoxLayout *>(ButtonGroup1->layout());
         if (boxlayout)
@@ -179,7 +179,7 @@ public:
 #ifndef Q_OS_MAC
         groupCentral->layout()->setSpacing(6);
 #endif
-        groupCentral->layout()->setMargin(11);
+        groupCentral->layout()->setContentsMargins(11, 11, 11, 11);
         vboxLayout2 = new QVBoxLayout();
         QBoxLayout *boxlayout1 = qobject_cast<QBoxLayout *>(groupCentral->layout());
         if (boxlayout1)
@@ -196,7 +196,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         hboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
         Horizontal_Spacing1 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -237,7 +237,7 @@ public:
 #ifndef Q_OS_MAC
         groupEffect->layout()->setSpacing(6);
 #endif
-        groupEffect->layout()->setMargin(11);
+        groupEffect->layout()->setContentsMargins(11, 11, 11, 11);
         vboxLayout3 = new QVBoxLayout();
         QBoxLayout *boxlayout2 = qobject_cast<QBoxLayout *>(groupEffect->layout());
         if (boxlayout2)
@@ -250,7 +250,7 @@ public:
         hboxLayout2->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         hboxLayout2->setObjectName(QString::fromUtf8("unnamed"));
@@ -272,7 +272,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout3->setSpacing(6);
 #endif
-        hboxLayout3->setMargin(0);
+        hboxLayout3->setContentsMargins(0, 0, 0, 0);
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         hboxLayout3->setObjectName(QString::fromUtf8("unnamed"));
         Horizontal_Spacing3 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -305,7 +305,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout4->setSpacing(6);
 #endif
-        hboxLayout4->setMargin(0);
+        hboxLayout4->setContentsMargins(0, 0, 0, 0);
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
         hboxLayout4->setObjectName(QString::fromUtf8("unnamed"));
         Horizontal_Spacing2 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);