diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-27 08:30:07 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-05-27 08:30:07 (GMT) |
| commit | d9e42d5c30ec551e6bded0277712eb0c6718b659 (patch) | |
| tree | 7ca4f5f08c644ea130ade8f2eaf84cf54abe797c /src/scripttools | |
| parent | fde5a9bde254dd0381762e2c52c0f4904599d40a (diff) | |
| parent | d61736900e8781fa2fa3b98f30abf8925787d0f9 (diff) | |
| download | Qt-d9e42d5c30ec551e6bded0277712eb0c6718b659.zip Qt-d9e42d5c30ec551e6bded0277712eb0c6718b659.tar.gz Qt-d9e42d5c30ec551e6bded0277712eb0c6718b659.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/scripttools')
| -rw-r--r-- | src/scripttools/debugging/qscriptenginedebugger.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/scripttools/debugging/qscriptenginedebugger.cpp b/src/scripttools/debugging/qscriptenginedebugger.cpp index e35bd1d..0f8b600 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.cpp +++ b/src/scripttools/debugging/qscriptenginedebugger.cpp @@ -63,16 +63,23 @@ #include <QtGui/qtoolbar.h> #include <QtGui/qboxlayout.h> +// this has to be outside the namespace +static void initScriptEngineDebuggerResources() +{ + Q_INIT_RESOURCE(scripttools_debugging); +} + +QT_BEGIN_NAMESPACE + class QtScriptDebuggerResourceInitializer { public: QtScriptDebuggerResourceInitializer() { - Q_INIT_RESOURCE(scripttools_debugging); + // call outside-the-namespace function + initScriptEngineDebuggerResources(); } }; -QT_BEGIN_NAMESPACE - /*! \since 4.5 \class QScriptEngineDebugger |