diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-12 05:34:21 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-12 05:34:21 (GMT) |
commit | 05c1b075f757afcc87748ac6758277eb5c0d8e17 (patch) | |
tree | 9f3159998e643ccd96313c94fb5eac2782aa3aab /src/scripttools | |
parent | 87845845cd5b44bc4ad391ad5ae8499f3850acb3 (diff) | |
parent | db3ae6188c8f88f25b4f8e2645e76a7c6fffef18 (diff) | |
download | Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.zip Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.tar.gz Qt-05c1b075f757afcc87748ac6758277eb5c0d8e17.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/scripttools')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h index 4a9447a..2513a8c 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qobjectdefs.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/private/qscopedpointer_p.h> #include <QtCore/qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h index 2f1da1e..452f7ea 100644 --- a/src/scripttools/debugging/qscriptdebuggervalue_p.h +++ b/src/scripttools/debugging/qscriptdebuggervalue_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qobjectdefs.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/private/qscopedpointer_p.h> #include <QtCore/qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h index 2ec6124..b130307 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h @@ -55,7 +55,7 @@ #include <QtCore/qobjectdefs.h> #include <QtCore/qlist.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/private/qscopedpointer_p.h> #include <QtScript/qscriptvalue.h> QT_BEGIN_NAMESPACE diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h index 5006c19..f42ffa5 100644 --- a/src/scripttools/debugging/qscriptscriptdata_p.h +++ b/src/scripttools/debugging/qscriptscriptdata_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qobjectdefs.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/private/qscopedpointer_p.h> #include <QtCore/qdatetime.h> #include <QtCore/qmap.h> diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h index 61b239d..ca290a1 100644 --- a/src/scripttools/debugging/qscriptvalueproperty_p.h +++ b/src/scripttools/debugging/qscriptvalueproperty_p.h @@ -55,7 +55,7 @@ #include <QtCore/qobjectdefs.h> #include <QtCore/qlist.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/private/qscopedpointer_p.h> #include <QtScript/qscriptvalue.h> QT_BEGIN_NAMESPACE |