4 files changed, 13 insertions, 9 deletions
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 9408a5b21..3a6c0500e 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -1143,13 +1143,6 @@ Requires: UNDOSTACK LISTVIEW
 Name: QUndoView
 SeeAlso: ???
 
-Feature: SCRIPT
-Description: Provides support for the QtScript module
-Section: Utilities
-Requires: TEXTDATE DATESTRING PROPERTIES
-Name: QtScript
-SeeAlso: ???
-
 Feature: ACCESSIBILITY
 Description: Provides accessibility support.
 Section: Utilities
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 672241889..7dbbc1b79 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2026,7 +2026,7 @@ inline void qSwap(T &value1, T &value2)
 template <> inline bool qIsDetached<TYPE>(TYPE &t) { return t.isDetached(); } \
 template <> inline void qSwap<TYPE>(TYPE &value1, TYPE &value2) \
 { \
-    qSwap<TYPE::DataPtr>(value1.data_ptr(), value2.data_ptr()); \
+    qSwap(value1.data_ptr(), value2.data_ptr()); \
 }
 
 /*
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index c8cf6dc54..0e654aff3 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -473,7 +473,7 @@ QT_END_NAMESPACE
 extern const char qt_core_interpreter[] __attribute__((section(".interp")))
     = ELF_INTERPRETER;
 
-extern "C"
+extern "C" void qt_core_boilerplate();
 void qt_core_boilerplate()
 {
     printf("This is the QtCore library version " QT_VERSION_STR "\n"
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index f86ffd35f..e93e477c3 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1445,6 +1445,17 @@ public:
         RightToLeft
     };
 
+    enum AnchorPoint {
+        AnchorLeft = 0,
+        AnchorHorizontalCenter,
+        AnchorRight,
+        AnchorTop,
+        AnchorVerticalCenter,
+        AnchorBottom
+    };
+
+
+
     enum DropAction {
         CopyAction = 0x1,
         MoveAction = 0x2,