Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix building against older Symbian^3 environments
  Fix QTextBrowser autotest to use "file" scheme in URLs.

2 files changed, 14 insertions, 6 deletions

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index e7084ac..3546079 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -94,6 +94,11 @@
 #define QT_EPSUidAknFep 0x100056de
 #define QT_EAknFepTouchInputActive 0x00000004
 
+// For compatibility with older Symbian^3 environments, which do not have this define yet.
+#ifndef R_AVKON_DISCREET_POPUP_TEXT_COPIED
+#define R_AVKON_DISCREET_POPUP_TEXT_COPIED 0x8cc0227
+#endif
+
 _LIT(KAvkonResourceFile, "z:\\resource\\avkon.rsc" );
 
 QT_BEGIN_NAMESPACE
@@ -1624,11 +1629,13 @@ void QCoeFepInputContext::copyOrCutTextToClipboard(const char *operation)
 
         if (cursor != anchor) {
             if (ccpuInvokeSlot(w, focusObject, operation)) {
-                TRAP_IGNORE(
-                    CAknDiscreetPopup::ShowGlobalPopupL(
-                        R_AVKON_DISCREET_POPUP_TEXT_COPIED,
-                        KAvkonResourceFile);
-                )
+                if (QSysInfo::symbianVersion() > QSysInfo::SV_SF_3) {
+                    TRAP_IGNORE(
+                        CAknDiscreetPopup::ShowGlobalPopupL(
+                            R_AVKON_DISCREET_POPUP_TEXT_COPIED,
+                            KAvkonResourceFile);
+                    )
+                }
             }
         }
     }
diff --git a/src/gui/widgets/qtextbrowser.cpp b/src/gui/widgets/qtextbrowser.cpp
index cd8fa11..e786c5c 100644
--- a/src/gui/widgets/qtextbrowser.cpp
+++ b/src/gui/widgets/qtextbrowser.cpp
@@ -619,7 +619,8 @@ void QTextBrowserPrivate::restoreHistoryEntry(const HistoryEntry entry)
     If you want to load documents stored in the Qt resource system use
     \c{qrc} as the scheme in the URL to load. For example, for the document
     resource path \c{:/docs/index.html} use \c{qrc:/docs/index.html} as
-    the URL with setSource().
+    the URL with setSource(). To access local files, use \c{file} as the
+    scheme in the URL.
 
     \sa QTextEdit, QTextDocument
 */