summaryrefslogtreecommitdiffstats
path: root/examples/qws
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-01 17:18:04 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-01 17:18:04 (GMT)
commit57b3d45dff62e0f23508601caf2560edd3dee33b (patch)
tree19cc94e225f18e6309030402964db4ee85d9d945 /examples/qws
parentd21fc5446c7583e153c1d566aefd7186f9c445cd (diff)
parent491bf41b96fdc48aa166ae7702e00f3e6eb1825c (diff)
downloadQt-57b3d45dff62e0f23508601caf2560edd3dee33b.zip
Qt-57b3d45dff62e0f23508601caf2560edd3dee33b.tar.gz
Qt-57b3d45dff62e0f23508601caf2560edd3dee33b.tar.bz2
Merge branch '4.5' into 4.6
Conflicts: examples/qws/dbscreen/dbscreen.cpp
Diffstat (limited to 'examples/qws')
-rw-r--r--examples/qws/dbscreen/dbscreen.cpp2
-rw-r--r--examples/qws/dbscreen/dbscreen.h21
2 files changed, 10 insertions, 13 deletions
diff --git a/examples/qws/dbscreen/dbscreen.cpp b/examples/qws/dbscreen/dbscreen.cpp
index aa33a97..3d3b15b 100644
--- a/examples/qws/dbscreen/dbscreen.cpp
+++ b/examples/qws/dbscreen/dbscreen.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
diff --git a/examples/qws/dbscreen/dbscreen.h b/examples/qws/dbscreen/dbscreen.h
index a3c392e..b177cfc 100644
--- a/examples/qws/dbscreen/dbscreen.h
+++ b/examples/qws/dbscreen/dbscreen.h
@@ -1,11 +1,11 @@
- /****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the examples of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the examples 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
@@ -36,11 +36,8 @@
**
**
** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
#ifndef DBSCREEN_H
#define DBSCREEN_H