diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 06:54:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 06:54:51 (GMT) |
| commit | e7935dc46fcc062b28cc3aa385f389fa3842b190 (patch) | |
| tree | 1559e188c8a4f3f149d5880e52f31ee996f4be2b /src/script | |
| parent | 54796e0d3150df7dd94e715c095c21fb227139ee (diff) | |
| parent | fc4d386f2cc8984b98957d83d8cdb57c1105890f (diff) | |
| download | Qt-e7935dc46fcc062b28cc3aa385f389fa3842b190.zip Qt-e7935dc46fcc062b28cc3aa385f389fa3842b190.tar.gz Qt-e7935dc46fcc062b28cc3aa385f389fa3842b190.tar.bz2 | |
Merge commit 'staging-1/4.7' into doc-4.7
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 3 | ||||
| -rw-r--r-- | src/script/api/qscriptprogram.cpp | 4 | ||||
| -rw-r--r-- | src/script/script.pro | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 8347626..07aced4 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -2626,8 +2626,7 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file } /*! - \internal - \since 4.6 + \since 4.7 Evaluates the given \a program and returns the result of the evaluation. diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp index 02beba4..3857b75 100644 --- a/src/script/api/qscriptprogram.cpp +++ b/src/script/api/qscriptprogram.cpp @@ -32,9 +32,7 @@ QT_BEGIN_NAMESPACE /*! - \internal - - \since 4.6 + \since 4.7 \class QScriptProgram \brief The QScriptProgram class encapsulates a Qt Script program. diff --git a/src/script/script.pro b/src/script/script.pro index 55217e0..4ee86d7 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -79,7 +79,10 @@ INCLUDEPATH += $$PWD include(script.pri) -symbian:TARGET.UID3=0x2001B2E1 +symbian { + TARGET.UID3=0x2001B2E1 + LIBS += -lhal +} # WebKit doesn't compile in C++0x mode *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x |