summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-10-04 00:44:35 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-10-04 00:44:35 (GMT)
commitd7c052a509191a0a5c632391ce318c5036900a18 (patch)
tree7380b737d7db544bbe698836f59600b4f20dd16d /src
parentfc31eac00ce27e445dac32f0fe0aeb6a27d3a684 (diff)
downloadQt-d7c052a509191a0a5c632391ce318c5036900a18.zip
Qt-d7c052a509191a0a5c632391ce318c5036900a18.tar.gz
Qt-d7c052a509191a0a5c632391ce318c5036900a18.tar.bz2
Compile
Task-number: QTBUG-14050
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout_p.h51
2 files changed, 55 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index 722378e..ca2963b 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -5,6 +5,8 @@
#include <private/qpainter_p.h>
#include <private/qpaintengineex_p.h>
+QT_BEGIN_NAMESPACE
+
class QDeclarativeTextLayoutPrivate
{
public:
@@ -311,3 +313,5 @@ void QDeclarativeTextLayout::draw(QPainter *painter, const QPointF &p)
}
}
+QT_END_NAMESPACE
+
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
index 1a4473d..90bf0e0 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
@@ -1,8 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
#ifndef QDECLARATIVETEXTLAYOUT_P_H
#define QDECLARATIVETEXTLAYOUT_P_H
#include <QtGui/qtextlayout.h>
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
class QDeclarativeTextLayoutPrivate;
class QDeclarativeTextLayout : public QTextLayout
{
@@ -20,4 +67,8 @@ private:
QDeclarativeTextLayoutPrivate *d;
};
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
#endif // QDECLARATIVETEXTLAYOUT_P_H