Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

2 files changed, 5 insertions, 3 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index ee25239..9604fff 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1606,6 +1606,9 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
 }
 
 #ifndef QT_NO_REGEXP
+
+extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
+
 /*!
   Creates a QtScript object of class RegExp with the given
   \a regexp.
@@ -1620,7 +1623,6 @@ QScriptValue QScriptEngine::newRegExp(const QRegExp &regexp)
     JSC::ArgList args(buf, sizeof(buf));
 
     //convert the pattern to a ECMAScript pattern
-    extern QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax);
     QString pattern = qt_regexp_toCanonical(regexp.pattern(), regexp.patternSyntax());
     if (regexp.isMinimal()) {
         QString ecmaPattern;
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h
index 2bc89bd..32f7a43 100644
--- a/src/script/api/qscriptvalue.h
+++ b/src/script/api/qscriptvalue.h
@@ -216,9 +216,9 @@ public:
 
 private:
     // force compile error, prevent QScriptValue(bool) to be called
-    inline QScriptValue(void *);
+    QScriptValue(void *);
     // force compile error, prevent QScriptValue(QScriptEngine*, bool) to be called
-    inline QScriptValue(QScriptEngine *, void *);
+    QScriptValue(QScriptEngine *, void *);
 
     QScriptValue(QScriptValuePrivate*);