Merge branch 'master-upstream' into master-water

4 files changed, 19 insertions, 0 deletions

diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 47b82ef..8eae391 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -31,3 +31,5 @@ linux*:!static:!symbian-armcc:!symbian-gcce {
 
 # Compensate for lack of platform defines in Symbian3 and Symbian4
 symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_))
+
+include(../../../tools/shared/symbian/epocroot.pri)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index d493390..8b2ab5a 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -62,6 +62,10 @@ QT_END_NAMESPACE
 #  include "private/qcore_mac_p.h"
 #endif
 
+#ifdef QLIBRARYINFO_EPOCROOT
+# include "symbian/epocroot_p.h"
+#endif
+
 #include "qconfig.cpp"
 
 QT_BEGIN_NAMESPACE
@@ -433,6 +437,14 @@ QLibraryInfo::location(LibraryLocation loc)
                             QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2,
                                 reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
             }
+
+#ifdef QLIBRARYINFO_EPOCROOT
+            // $${EPOCROOT} is a special case, resolve it similarly to qmake.
+            QRegExp epocrootMatcher(QLatin1String("\\$\\$\\{EPOCROOT\\}"));
+            if ((rep = epocrootMatcher.indexIn(ret)) != -1)
+                ret.replace(rep, epocrootMatcher.matchedLength(), qt_epocRoot());
+#endif
+
             config->endGroup();
         }
     }
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 830d35b..b83c7c3 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -519,6 +519,8 @@ public:
 
         WA_X11DoNotAcceptFocus = 132,
 
+        WA_MacNoShadow = 133,
+
         // Add new attributes before this line
         WA_AttributeCount
     };
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index d911c4c..9bca386 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1257,6 +1257,9 @@
     to this top level window. This attribute has no effect on non-X11
     platforms.
 
+    \value WA_MacNoShadow Since Qt 4.8, this attribute disables drop shadows
+    for this top level window. Only affects Cocoa builds of Qt for Mac OS X.
+
     \omitvalue WA_SetLayoutDirection
     \omitvalue WA_InputMethodTransparent
     \omitvalue WA_WState_CompressKeys