diff options
| author | juhvu <qt-info@nokia.com> | 2011-02-02 00:16:16 (GMT) |
|---|---|---|
| committer | juhvu <qt-info@nokia.com> | 2011-02-02 00:16:16 (GMT) |
| commit | e09cd7062bb50067eb2d2db9197eb9d4ee170360 (patch) | |
| tree | ca3f7e9c9b86a359b90030f11206ce38cf3c2a90 /src | |
| parent | 88b072b3644cfd960367096ae0103e8ddef0d06d (diff) | |
| download | Qt-e09cd7062bb50067eb2d2db9197eb9d4ee170360.zip Qt-e09cd7062bb50067eb2d2db9197eb9d4ee170360.tar.gz Qt-e09cd7062bb50067eb2d2db9197eb9d4ee170360.tar.bz2 | |
Froze two more symbols and fixed compilation error (QtQuick11).
Reviewed-by: Martin Jones
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativestate_p.h | 4 | ||||
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 2 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h index 45e6e8d..60d0e0b 100644 --- a/src/declarative/util/qdeclarativestate_p.h +++ b/src/declarative/util/qdeclarativestate_p.h @@ -45,7 +45,7 @@ #include <qdeclarative.h> #include <qdeclarativeproperty.h> #include <QtCore/qobject.h> -#include <private/qdeclarativebinding_p.h> +#include <QtCore/qsharedpointer.h> #include <private/qdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -76,7 +76,7 @@ public: QVariant toValue; QDeclarativeAbstractBinding *fromBinding; - QDeclarativeAbstractBinding::Pointer toBinding; + QWeakPointer<QDeclarativeAbstractBinding> toBinding; QDeclarativeActionEvent *event; //strictly for matching diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 6a2bcb9..adf2b3c 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12948,4 +12948,6 @@ EXPORTS ?ensureLayouted@QTextDocumentLayout@@QAEXM@Z @ 12947 NONAME ; void QTextDocumentLayout::ensureLayouted(float) ?layoutFinished@QTextDocumentLayout@@AAEXXZ @ 12948 NONAME ; void QTextDocumentLayout::layoutFinished(void) ?dynamicPageCount@QTextDocumentLayout@@QBEHXZ @ 12949 NONAME ; int QTextDocumentLayout::dynamicPageCount(void) const + ?setWordSelectionEnabled@QTextControl@@QAEX_N@Z @ 12950 NONAME ; void QTextControl::setWordSelectionEnabled(bool) + ?isWordSelectionEnabled@QTextControl@@QBE_NXZ @ 12951 NONAME ; bool QTextControl::isWordSelectionEnabled(void) const diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index d552931..564f530 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12143,4 +12143,6 @@ EXPORTS _ZNK19QTextDocumentLayout9pageCountEv @ 12142 NONAME _ZTI19QTextDocumentLayout @ 12143 NONAME _ZTV19QTextDocumentLayout @ 12144 NONAME + _ZN12QTextControl23setWordSelectionEnabledEb @ 12145 NONAME + _ZNK12QTextControl22isWordSelectionEnabledEv @ 12146 NONAME |