[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/plasma/scriptengines/javascript
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-10-20 19:40:30
Message-ID: 20101020194030.F416FAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187930 by mart:

don't register print() in the declarative bindings: t' already there


 M  +2 -2      CMakeLists.txt  
 A             common/declarativescriptenv.cpp   [License: LGPL (v2)]
 A             common/jsscriptenv.cpp   common/scriptenvui.cpp#1187242 [License: LGPL \
(v2)]  M  +2 -0      common/scriptenv.cpp  
 D             common/scriptenvui.cpp  


--- trunk/KDE/kdebase/runtime/plasma/scriptengines/javascript/CMakeLists.txt \
#1187929:1187930 @@ -2,7 +2,7 @@
 
 set(simple_javascript_engine_SRCS
     common/javascriptaddonpackagestructure.cpp
-    common/scriptenvui.cpp
+    common/jsscriptenv.cpp
     plasmoid/abstractjsappletscript.cpp
     plasmoid/appletauthorization.cpp
     plasmoid/jsappletinterface.cpp
@@ -113,7 +113,7 @@
 #DECLARATIVE APPLET
 set(declarative_appletscript_SRCS
     common/javascriptaddonpackagestructure.cpp
-    common/scriptenvui.cpp
+    common/declarativescriptenv.cpp
     plasmoid/abstractjsappletscript.cpp
     plasmoid/appletauthorization.cpp
     plasmoid/appletinterface.cpp
--- trunk/KDE/kdebase/runtime/plasma/scriptengines/javascript/common/scriptenv.cpp \
#1187929:1187930 @@ -70,7 +70,9 @@
                        \
QScriptValue::ReadOnly|QScriptValue::Undeletable|QScriptValue::SkipInEnumeration);  
     // Add utility functions
+#ifndef DECLARATIVE
     global.setProperty("print", m_engine->newFunction(ScriptEnv::print));
+#endif
     global.setProperty("debug", m_engine->newFunction(ScriptEnv::debug));
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]