diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-08 16:27:41 +0100 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-02-08 16:31:20 +0100 |
commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /src/script/api/qscriptvalue.h | |
parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
download | qtscript-84f9848fd9f20536b18834a54ef15c6a65f8a682.tar.gz |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'src/script/api/qscriptvalue.h')
-rw-r--r-- | src/script/api/qscriptvalue.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h index 670f928..9ea69c1 100644 --- a/src/script/api/qscriptvalue.h +++ b/src/script/api/qscriptvalue.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -30,8 +30,6 @@ #include <QtCore/qsharedpointer.h> #include <QtScript/qtscriptglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -218,6 +216,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::PropertyFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif |