diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-21 09:02:17 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-21 09:02:17 (GMT) |
| commit | 38e0c07a78fb585e23c4ff8947be737a28b2257c (patch) | |
| tree | d6b1bd21d1971c6cde4dfc95c19b8abc4ad57296 /src/script/api/qscriptstring.h | |
| parent | a44894a39113e0eb9d4f7c912eee4671b3f391c1 (diff) | |
| download | Qt-38e0c07a78fb585e23c4ff8947be737a28b2257c.zip Qt-38e0c07a78fb585e23c4ff8947be737a28b2257c.tar.gz Qt-38e0c07a78fb585e23c4ff8947be737a28b2257c.tar.bz2 | |
compile again after merge
Diffstat (limited to 'src/script/api/qscriptstring.h')
| -rw-r--r-- | src/script/api/qscriptstring.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h index c141e76..b216703 100644 --- a/src/script/api/qscriptstring.h +++ b/src/script/api/qscriptstring.h @@ -44,7 +44,7 @@ #include <QtCore/qstring.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/qsharedpointer.h> QT_BEGIN_HEADER @@ -74,7 +74,7 @@ public: operator QString() const; private: - QCustomScopedPointer<QScriptStringPrivate, QScriptStringPrivatePointerDeleter> d_ptr; + QExplicitlySharedDataPointer<QScriptStringPrivate> d_ptr; friend class QScriptValue; Q_DECLARE_PRIVATE(QScriptString) }; |