summaryrefslogtreecommitdiffstats
path: root/src/script/bridge
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-01-27 03:49:12 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2011-01-27 03:49:12 (GMT)
commitd9e4393ef212dba9eeba68277b270d68bcdbc733 (patch)
treed65ff0df673db66478b081d672f3fe383ae6e5a5 /src/script/bridge
parentf15778e60ba538b8715f6433a472ffe08a21d934 (diff)
downloadQt-d9e4393ef212dba9eeba68277b270d68bcdbc733.zip
Qt-d9e4393ef212dba9eeba68277b270d68bcdbc733.tar.gz
Qt-d9e4393ef212dba9eeba68277b270d68bcdbc733.tar.bz2
Implement property versioning inside the declarative engine
Task-number: QTBUG-13451
Diffstat (limited to 'src/script/bridge')
-rw-r--r--src/script/bridge/qscriptdeclarativeclass.cpp5
-rw-r--r--src/script/bridge/qscriptdeclarativeclass_p.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp
index 4782852..6126b32 100644
--- a/src/script/bridge/qscriptdeclarativeclass.cpp
+++ b/src/script/bridge/qscriptdeclarativeclass.cpp
@@ -179,6 +179,11 @@ QScriptDeclarativeClass::PersistentIdentifier::operator=(const PersistentIdentif
return *this;
}
+QString QScriptDeclarativeClass::PersistentIdentifier::toString() const
+{
+ return ((JSC::Identifier &)d).ustring();
+}
+
QScriptDeclarativeClass::QScriptDeclarativeClass(QScriptEngine *engine)
: d_ptr(new QScriptDeclarativeClassPrivate)
{
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
index 3123b3c..e4c18f5 100644
--- a/src/script/bridge/qscriptdeclarativeclass_p.h
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -107,6 +107,7 @@ public:
PersistentIdentifier(const PersistentIdentifier &other);
PersistentIdentifier &operator=(const PersistentIdentifier &other);
+ QString toString() const;
private:
friend class QScriptDeclarativeClass;
PersistentIdentifier(QScriptEnginePrivate *e) : identifier(0), engine(e), d(0) {}
ion value='bug_879a0747be'>bug_879a0747be Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.
summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-24 11:06:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-24 11:06:44 (GMT)
commitf9465250b939d54021e85ba03eaf63f31b4b3037 (patch)
tree2ae41f24c9d29f6ca8124e305514a4dc07a62ace /generic
parentd13f877148291986699ef0c0cfb2246bc8c44faa (diff)
parent2101ef45be45e0aa88d3e8c9725df9ca92309fe9 (diff)
downloadtcl-f9465250b939d54021e85ba03eaf63f31b4b3037.zip
tcl-f9465250b939d54021e85ba03eaf63f31b4b3037.tar.gz
tcl-f9465250b939d54021e85ba03eaf63f31b4b3037.tar.bz2
Fix [5d170b5ca5e12743006d737c79f959f3efabc644|5d170b5ca5]: checkin 9f8b7bea5344f1b0 broke netbsd's thread notifier
Diffstat (limited to 'generic')
-rw-r--r--generic/tclInt.h3
-rw-r--r--generic/tclThread.c39
2 files changed, 0 insertions, 42 deletions