summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbobject.h
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2011-05-26 08:16:29 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2011-05-26 08:16:29 (GMT)
commitca85a324e2fb5401c582bfa622831652c19028b2 (patch)
treef83127cdf1dd0ec5ee32c5b334ec7c0ffdeedd6f /src/plugins/platforms/xcb/qxcbobject.h
parenta816cb0d26ebcef54e9e61c72455509edf6c44b9 (diff)
parent59852c9a855e6b9963c27c9a028faf6d23ea9974 (diff)
downloadQt-ca85a324e2fb5401c582bfa622831652c19028b2.zip
Qt-ca85a324e2fb5401c582bfa622831652c19028b2.tar.gz
Qt-ca85a324e2fb5401c582bfa622831652c19028b2.tar.bz2
Merge remote branch 'upstream/4.8'
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbobject.h')
-rw-r--r--src/plugins/platforms/xcb/qxcbobject.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/platforms/xcb/qxcbobject.h b/src/plugins/platforms/xcb/qxcbobject.h
index 69494b0..089c76e 100644
--- a/src/plugins/platforms/xcb/qxcbobject.h
+++ b/src/plugins/platforms/xcb/qxcbobject.h
@@ -7,29 +7,29 @@
** This file is part of the plugins 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.
+** 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
+** 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.
-**
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
**
**
**