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/mainwindow.ui.h b/tests/auto/uic/baseline/mainwindow.ui.h
index 69e45f5..73a9de2 100644
--- a/tests/auto/uic/baseline/mainwindow.ui.h
+++ b/tests/auto/uic/baseline/mainwindow.ui.h
@@ -102,7 +102,7 @@ public:
         vboxLayout->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(9);
+        vboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         groupBox = new QGroupBox(centralwidget);
@@ -112,7 +112,7 @@ public:
         hboxLayout->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout->setMargin(9);
+        hboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         label = new QLabel(groupBox);
@@ -165,7 +165,7 @@ public:
         vboxLayout1->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(9);
+        vboxLayout1->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
         chooseFromCodePoints = new QRadioButton(groupBox_2);
@@ -178,7 +178,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout2->setSpacing(6);
 #endif
-        vboxLayout2->setMargin(0);
+        vboxLayout2->setContentsMargins(0, 0, 0, 0);
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
         characterRangeView = new QListWidget(groupBox_2);
         characterRangeView->setObjectName(QString::fromUtf8("characterRangeView"));
@@ -189,7 +189,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         selectAll = new QPushButton(groupBox_2);
         selectAll->setObjectName(QString::fromUtf8("selectAll"));
@@ -225,7 +225,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout2->setSpacing(6);
 #endif
-        hboxLayout2->setMargin(0);
+        hboxLayout2->setContentsMargins(0, 0, 0, 0);
         hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
         label_5 = new QLabel(groupBox_2);
         label_5->setObjectName(QString::fromUtf8("label_5"));
@@ -264,7 +264,7 @@ public:
         hboxLayout3->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout3->setMargin(9);
+        hboxLayout3->setContentsMargins(9, 9, 9, 9);
 #endif
         hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
         preview = new QLineEdit(groupBox_3);
@@ -282,7 +282,7 @@ public:
         hboxLayout4->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout4->setMargin(9);
+        hboxLayout4->setContentsMargins(9, 9, 9, 9);
 #endif
         hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
         label_3 = new QLabel(groupBox_4);
@@ -318,7 +318,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout5->setSpacing(6);
 #endif
-        hboxLayout5->setMargin(0);
+        hboxLayout5->setContentsMargins(0, 0, 0, 0);
         hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
         generate = new QPushButton(centralwidget);
         generate->setObjectName(QString::fromUtf8("generate"));