diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-12 07:22:39 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-12 07:22:39 (GMT) |
commit | c785d92153d23b836451b0643424b9871bcc4be9 (patch) | |
tree | fce8119445f239a755bc9be654e6e8d086541285 /src/scripttools/debugging | |
parent | fe0f807e1f4e7510c6d8cddd848bcbc25e358651 (diff) | |
parent | 118412e46f5b5af58eaa3012f9fb086894f9b5f2 (diff) | |
download | Qt-c785d92153d23b836451b0643424b9871bcc4be9.zip Qt-c785d92153d23b836451b0643424b9871bcc4be9.tar.gz Qt-c785d92153d23b836451b0643424b9871bcc4be9.tar.bz2 |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/scripttools/debugging')
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 |