diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-17 22:33:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-17 22:33:51 (GMT) |
| commit | 83a2be48a82394ae692d91587c64f8ccd385350f (patch) | |
| tree | 367d954e74f70acdec4d96253bc5cf72c4eb0c9f /mkspecs/win32-g++ | |
| parent | 9d76dc110124b90bbe362ec8b09db9fc784c0b2d (diff) | |
| parent | 006c8e22075112eff6230d8168d716e44a9e29d5 (diff) | |
| download | Qt-83a2be48a82394ae692d91587c64f8ccd385350f.zip Qt-83a2be48a82394ae692d91587c64f8ccd385350f.tar.gz Qt-83a2be48a82394ae692d91587c64f8ccd385350f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
Updating file with CRLF line endings for the updated header
Update licenseheader text in source files for qt4.8
X11: Keep the menubar inside the widgetbox window in toplevel mode
Retain ABI and API compatibility when Qt is built with EGL.
Allow 'typeinfo <file>' lines in qmldir.
qmlplugindump: Use command line options with a single dash.
qmlplugindump: Allow dumping by path without URI.
Move qmldump from Qt Creator to Qt.
Diffstat (limited to 'mkspecs/win32-g++')
| -rw-r--r-- | mkspecs/win32-g++/qplatformdefs.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h index ad71dce..36eacb2 100644 --- a/mkspecs/win32-g++/qplatformdefs.h +++ b/mkspecs/win32-g++/qplatformdefs.h @@ -7,29 +7,29 @@ ** This file is part of the qmake spec 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. ** ** ** |