diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-03 01:24:52 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-03 01:24:52 (GMT) |
| commit | 1b3f43c997b00d6b0d435ed8be08596c913a0189 (patch) | |
| tree | 26b8c4adaf5f07d1a67f838f4053fb2b0ba466bc /src/s60installs/bwins | |
| parent | 8250d455d8d85c5fe0c819f997ba0902315bfce4 (diff) | |
| download | Qt-4.7.1.zip Qt-4.7.1.tar.gz Qt-4.7.1.tar.bz2 | |
Qml Debugging: Only enable if explicitly requestedv4.7.1
Enable the remote debugging of QDeclarativeEngines only after
QDeclarativeDebugHelper::enableDebugging()
has been called.
Approved by 4.7 Program Team.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
(cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)
Conflicts:
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/eabi/QtDeclarativeu.def
Diffstat (limited to 'src/s60installs/bwins')
| -rw-r--r-- | src/s60installs/bwins/QtDeclarativeu.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index 581c3b8..8f878b1 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -1838,4 +1838,4 @@ EXPORTS ?addChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1837 NONAME ; void QDeclarativeBasePositioner::addChanged(void) ?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1838 NONAME ; void QDeclarativeAbstractAnimation::start(void) ?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *) - + ?enableDebugging@QDeclarativeDebugHelper@@SAXXZ @ 1840 NONAME ; void QDeclarativeDebugHelper::enableDebugging(void) |