forked from qt-creator/qt-creator
Fixed (C)opyright headers.
This commit is contained in:
@@ -6,12 +6,12 @@
|
||||
--
|
||||
-- Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
--
|
||||
-- Commercial Usage
|
||||
-- No Commercial Usage
|
||||
--
|
||||
-- Licensees holding valid Qt Commercial licenses may use this file in
|
||||
-- accordance with the Qt Commercial License Agreement provided with the
|
||||
-- Software or, alternatively, in accordance with the terms contained in
|
||||
-- a written agreement between you and Nokia.
|
||||
-- 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
|
||||
--
|
||||
@@ -22,8 +22,13 @@
|
||||
-- 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.
|
||||
--
|
||||
-- If you are unsure which license is appropriate for your use, please
|
||||
-- contact the sales department at http://qt.nokia.com/contact.
|
||||
-- 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.
|
||||
--
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
%decl glslparser.h
|
||||
@@ -430,12 +435,12 @@ private:
|
||||
**
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** Commercial Usage
|
||||
** No Commercial Usage
|
||||
**
|
||||
** Licensees holding valid Qt Commercial licenses may use this file in
|
||||
** accordance with the Qt Commercial License Agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Nokia.
|
||||
** 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
|
||||
**
|
||||
@@ -446,8 +451,12 @@ private:
|
||||
** 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.
|
||||
**
|
||||
** If you are unsure which license is appropriate for your use, please
|
||||
** contact the sales department at http://qt.nokia.com/contact.
|
||||
** 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.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
|
||||
#line 213 "./glsl.g"
|
||||
#line 218 "./glsl.g"
|
||||
|
||||
/**************************************************************************
|
||||
**
|
||||
|
||||
Reference in New Issue
Block a user