Merge remote branch 'origin/4.7' into lighthouse

Conflicts:
	configure
	src/gui/kernel/qapplication.cpp
	src/gui/painting/qbackingstore.cpp
	src/opengl/qgl.cpp
	src/opengl/qgl_p.h
	src/plugins/plugins.pro
	tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
	tools/tools.pro

7 files changed, 56 insertions, 4 deletions

diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index acb3a00..c66047a 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -335,6 +335,11 @@
 #define QT_NO_DATESTRING
 #endif
 
+// QtDBus module
+#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES))
+#define QT_NO_DBUS
+#endif
+
 // QDial
 #if !defined(QT_NO_DIAL) && (defined(QT_NO_SLIDER))
 #define QT_NO_DIAL
@@ -500,6 +505,11 @@
 #define QT_NO_XMLSTREAMWRITER
 #endif
 
+// Bearer Management
+#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY))
+#define QT_NO_BEARERMANAGEMENT
+#endif
+
 // Context menu
 #if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU))
 #define QT_NO_CONTEXTMENU
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 251391e..ed173b1 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -1098,6 +1098,14 @@ Requires: TEMPORARYFILE
 Name: QNetworkDiskCache
 SeeAlso: ???
 
+Feature: BEARERMANAGEMENT
+Description: Provides bearer management support
+Section: Networking
+Requires: LIBRARY
+Name: Bearer Management
+SeeAlso: ???
+
+
 # Utilities
 
 Feature: COMPLETER
@@ -1360,6 +1368,15 @@ Requires: PROPERTIES
 Name: ActiveQt
 SeeAlso: ???
 
+# D-Bus
+
+Feature: DBUS
+Description: Provides classes for D-Bus.
+Section: D-Bus
+Requires: PROPERTIES
+Name: QtDBus module
+SeeAlso: ???
+
 # Phonon
 
 Feature: PHONON_PLATFORMPLUGIN
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 74d39bd..4ed2d09 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -58,6 +58,11 @@
 #include <stdarg.h>
 #include <string.h>
 
+#ifndef QT_NO_EXCEPTIONS
+#  include <string>
+#  include <exception>
+#endif
+
 #if !defined(Q_OS_WINCE)
 #  include <errno.h>
 #  if defined(Q_CC_MSVC)
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index ea49a5a..c609018 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2429,12 +2429,15 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #define Q_SYMBIAN_FIXED_POINTER_CURSORS
 #define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
 #define Q_SYMBIAN_WINDOW_SIZE_CACHE
-//enabling new graphics resources
-#define QT_SYMBIAN_SUPPORTS_SGIMAGE
 #define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
 
+//enabling new graphics resources
+#ifdef SYMBIAN_GRAPHICS_EGL_SGIMAGELITE
+#  define QT_SYMBIAN_SUPPORTS_SGIMAGE
+#endif
+
 #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
-#define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE
+#  define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE
 #endif
 #endif
 
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 9490225..3515777 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -329,6 +329,10 @@ QLibraryInfo::location(LibraryLocation loc)
             key = QLatin1String("Plugins");
             defaultValue = QLatin1String("plugins");
             break;
+        case ImportsPath:
+            key = QLatin1String("Imports");
+            defaultValue = QLatin1String("imports");
+            break;
         case DataPath:
             key = QLatin1String("Data");
             break;
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 5345771..fe95851 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -146,7 +146,8 @@ public:
         NoButton         = 0x00000000,
         LeftButton       = 0x00000001,
         RightButton      = 0x00000002,
-        MidButton        = 0x00000004,
+        MidButton        = 0x00000004, // ### Qt 5: remove me
+        MiddleButton     = MidButton,
         XButton1         = 0x00000008,
         XButton2         = 0x00000010,
         MouseButtonMask  = 0x000000ff
@@ -510,6 +511,9 @@ public:
         WA_Maemo5AutoOrientation = 130,
         WA_Maemo5ShowProgressIndicator = 131,
 #endif
+
+        WA_X11DoNotAcceptFocus = 132,
+
         // Add new attributes before this line
         WA_AttributeCount
     };
@@ -1088,6 +1092,8 @@ public:
         Key_Call = 0x01100004,
         Key_Hangup = 0x01100005,
         Key_Flip = 0x01100006,
+        Key_Camera = 0x01100007,
+        Key_CameraFocus = 0x01100008,
 
         Key_unknown = 0x01ffffff
     };
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index f8f3c49..f71ba9d 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -185,6 +185,7 @@
     left-handed mice.)
     \value RightButton     The right button.
     \value MidButton       The middle button.
+    \value MiddleButton    The middle button.
     \value XButton1        The first X button.
     \value XButton2        The second X button.
 
@@ -1255,6 +1256,10 @@
     window boundary (widget without parent or dialog) is found.
     This attribute currently has effect only on Symbian platforms
 
+    \value WA_X11DoNotAcceptFocus Asks the window manager to not give focus
+    to this top level window. This attribute has no effect on non-X11
+    platforms.
+
     \omitvalue WA_SetLayoutDirection
     \omitvalue WA_InputMethodTransparent
     \omitvalue WA_WState_CompressKeys
@@ -1737,6 +1742,8 @@
     \value Key_unknown
 
     \value Key_Call
+    \value Key_Camera
+    \value Key_CameraFocus
     \value Key_Context1
     \value Key_Context2
     \value Key_Context3