Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
flatpak-qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marco Bubke
flatpak-qt-creator
Commits
d6217a07
Commit
d6217a07
authored
14 years ago
by
Erik Verbruggen
Browse files
Options
Downloads
Patches
Plain Diff
Fixed (C)opyright headers.
parent
89b877a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/libs/glsl/glsl.g
+23
-14
23 additions, 14 deletions
src/libs/glsl/glsl.g
src/libs/glsl/glslparser.cpp
+318
-318
318 additions, 318 deletions
src/libs/glsl/glslparser.cpp
src/libs/glsl/glslparser.h
+1
-1
1 addition, 1 deletion
src/libs/glsl/glslparser.h
with
342 additions
and
333 deletions
src/libs/glsl/glsl.g
+
23
−
14
View file @
d6217a07
...
...
@@ -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 accompany
in
g
--
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 accompany
in
g
**
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.
**
**************************************************************************/
...
...
This diff is collapsed.
Click to expand it.
src/libs/glsl/glslparser.cpp
+
318
−
318
View file @
d6217a07
This diff is collapsed.
Click to expand it.
src/libs/glsl/glslparser.h
+
1
−
1
View file @
d6217a07
#line 21
3
"./glsl.g"
#line 21
8
"./glsl.g"
/**************************************************************************
**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment