Skip to content

Commit f690c2c

Browse files
florianlinkflorianlink
committed
updated generator to LGPLed version from gitorious
1 parent 80248c4 commit f690c2c

110 files changed

Lines changed: 4001 additions & 5559 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎generator/LGPL_EXCEPTION.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Nokia Qt LGPL Exception version 1.1
2+
3+
As an additional permission to the GNU Lesser General Public License version
4+
2.1, the object code form of a "work that uses the Library" may incorporate
5+
material from a header file that is part of the Library. You may distribute
6+
such object code under terms of your choice, provided that:
7+
(i) the header files of the Library have not been modified; and
8+
(ii) the incorporated material is limited to numerical parameters, data
9+
structure layouts, accessors, macros, inline functions and
10+
templates; and
11+
(iii) you comply with the terms of Section 6 of the GNU Lesser General
12+
Public License version 2.1.
13+
14+
Moreover, you may apply this exception to a modified version of the Library,
15+
provided that such modification does not involve copying material from the
16+
Library into the modified Library's header files unless such material is
17+
limited to (i) numerical parameters; (ii) data structure layouts;
18+
(iii) accessors; and (iv) small macros, templates and inline functions of
19+
five lines or less in length.
20+
21+
Furthermore, you are not required to apply this additional permission to a
22+
modified version of the Library.

‎generator/LICENSE.GPL‎

Lines changed: 0 additions & 342 deletions
This file was deleted.

‎generator/LICENSE.LGPL‎

Lines changed: 514 additions & 0 deletions
Large diffs are not rendered by default.

‎generator/abstractmetabuilder.cpp‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
3+
** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
4+
** All rights reserved.
5+
** Contact: Nokia Corporation (qt-info@nokia.com)
46
**
5-
** This file is part of the Qt Script Generator project on Trolltech Labs.
7+
** This file is part of the Qt Script Generator project on Qt Labs.
68
**
7-
** This file may be used under the terms of the GNU General Public
8-
** License version 2.0 as published by the Free Software Foundation
9-
** and appearing in the file LICENSE.GPL included in the packaging of
10-
** this file. Please review the following information to ensure GNU
11-
** General Public Licensing requirements will be met:
12-
** http://www.trolltech.com/products/qt/opensource.html
9+
** $QT_BEGIN_LICENSE:LGPL$
10+
** No Commercial Usage
11+
** This file contains pre-release code and may not be distributed.
12+
** You may use this file in accordance with the terms and conditions
13+
** contained in the Technology Preview License Agreement accompanying
14+
** this package.
1315
**
14-
** If you are unsure which license is appropriate for your use, please
15-
** review the following information:
16-
** http://www.trolltech.com/products/qt/licensing.html or contact the
17-
** sales department at sales@trolltech.com.
16+
** GNU Lesser General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU Lesser
18+
** General Public License version 2.1 as published by the Free Software
19+
** Foundation and appearing in the file LICENSE.LGPL included in the
20+
** packaging of this file. Please review the following information to
21+
** ensure the GNU Lesser General Public License version 2.1 requirements
22+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1823
**
19-
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
20-
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
** In addition, as a special exception, Nokia gives you certain additional
25+
** rights. These rights are described in the Nokia Qt LGPL Exception
26+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27+
**
28+
** If you have questions regarding the use of this file, please contact
29+
** Nokia at qt-info@nokia.com.
30+
**
31+
**
32+
**
33+
**
34+
**
35+
**
36+
**
37+
**
38+
** $QT_END_LICENSE$
2139
**
2240
****************************************************************************/
2341

@@ -448,6 +466,10 @@ bool AbstractMetaBuilder::build()
448466
global->addEnum(meta_enum);
449467
meta_enum->setEnclosingClass(global);
450468
meta_enum->typeEntry()->setQualifier(globalName);
469+
470+
// Global enums should be public despite not having public
471+
// identifiers so we'll fix the original attributes here.
472+
meta_enum->setOriginalAttributes(meta_enum->attributes());
451473
}
452474

453475

@@ -1042,6 +1064,9 @@ AbstractMetaEnum *AbstractMetaBuilder::traverseEnum(EnumModelItem enum_item, Abs
10421064
m_enum_values[meta_enum_value->name()] = meta_enum_value;
10431065
}
10441066

1067+
QFileInfo info(enum_item->fileName());
1068+
meta_enum->typeEntry()->setInclude(Include(Include::IncludePath, info.fileName()));
1069+
10451070
m_enums << meta_enum;
10461071

10471072
return meta_enum;

‎generator/abstractmetabuilder.h‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
3+
** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
4+
** All rights reserved.
5+
** Contact: Nokia Corporation (qt-info@nokia.com)
46
**
5-
** This file is part of the Qt Script Generator project on Trolltech Labs.
7+
** This file is part of the Qt Script Generator project on Qt Labs.
68
**
7-
** This file may be used under the terms of the GNU General Public
8-
** License version 2.0 as published by the Free Software Foundation
9-
** and appearing in the file LICENSE.GPL included in the packaging of
10-
** this file. Please review the following information to ensure GNU
11-
** General Public Licensing requirements will be met:
12-
** http://www.trolltech.com/products/qt/opensource.html
9+
** $QT_BEGIN_LICENSE:LGPL$
10+
** No Commercial Usage
11+
** This file contains pre-release code and may not be distributed.
12+
** You may use this file in accordance with the terms and conditions
13+
** contained in the Technology Preview License Agreement accompanying
14+
** this package.
1315
**
14-
** If you are unsure which license is appropriate for your use, please
15-
** review the following information:
16-
** http://www.trolltech.com/products/qt/licensing.html or contact the
17-
** sales department at sales@trolltech.com.
16+
** GNU Lesser General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU Lesser
18+
** General Public License version 2.1 as published by the Free Software
19+
** Foundation and appearing in the file LICENSE.LGPL included in the
20+
** packaging of this file. Please review the following information to
21+
** ensure the GNU Lesser General Public License version 2.1 requirements
22+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1823
**
19-
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
20-
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
** In addition, as a special exception, Nokia gives you certain additional
25+
** rights. These rights are described in the Nokia Qt LGPL Exception
26+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27+
**
28+
** If you have questions regarding the use of this file, please contact
29+
** Nokia at qt-info@nokia.com.
30+
**
31+
**
32+
**
33+
**
34+
**
35+
**
36+
**
37+
**
38+
** $QT_END_LICENSE$
2139
**
2240
****************************************************************************/
2341

‎generator/abstractmetalang.cpp‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
3+
** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
4+
** All rights reserved.
5+
** Contact: Nokia Corporation (qt-info@nokia.com)
46
**
5-
** This file is part of the Qt Script Generator project on Trolltech Labs.
7+
** This file is part of the Qt Script Generator project on Qt Labs.
68
**
7-
** This file may be used under the terms of the GNU General Public
8-
** License version 2.0 as published by the Free Software Foundation
9-
** and appearing in the file LICENSE.GPL included in the packaging of
10-
** this file. Please review the following information to ensure GNU
11-
** General Public Licensing requirements will be met:
12-
** http://www.trolltech.com/products/qt/opensource.html
9+
** $QT_BEGIN_LICENSE:LGPL$
10+
** No Commercial Usage
11+
** This file contains pre-release code and may not be distributed.
12+
** You may use this file in accordance with the terms and conditions
13+
** contained in the Technology Preview License Agreement accompanying
14+
** this package.
1315
**
14-
** If you are unsure which license is appropriate for your use, please
15-
** review the following information:
16-
** http://www.trolltech.com/products/qt/licensing.html or contact the
17-
** sales department at sales@trolltech.com.
16+
** GNU Lesser General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU Lesser
18+
** General Public License version 2.1 as published by the Free Software
19+
** Foundation and appearing in the file LICENSE.LGPL included in the
20+
** packaging of this file. Please review the following information to
21+
** ensure the GNU Lesser General Public License version 2.1 requirements
22+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1823
**
19-
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
20-
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
** In addition, as a special exception, Nokia gives you certain additional
25+
** rights. These rights are described in the Nokia Qt LGPL Exception
26+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27+
**
28+
** If you have questions regarding the use of this file, please contact
29+
** Nokia at qt-info@nokia.com.
30+
**
31+
**
32+
**
33+
**
34+
**
35+
**
36+
**
37+
**
38+
** $QT_END_LICENSE$
2139
**
2240
****************************************************************************/
2341

@@ -1386,9 +1404,9 @@ AbstractMetaFunctionList AbstractMetaClass::queryFunctions(uint query) const
13861404
continue;
13871405
}
13881406

1389-
if ((query & Constructors) && (!f->isConstructor()
1390-
|| f->ownerClass() != f->implementingClass())
1391-
|| f->isConstructor() && (query & Constructors) == 0) {
1407+
if (((query & Constructors) && (!f->isConstructor()
1408+
|| f->ownerClass() != f->implementingClass()))
1409+
|| (f->isConstructor() && (query & Constructors) == 0)) {
13921410
continue;
13931411
}
13941412

‎generator/abstractmetalang.h‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
3+
** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
4+
** All rights reserved.
5+
** Contact: Nokia Corporation (qt-info@nokia.com)
46
**
5-
** This file is part of the Qt Script Generator project on Trolltech Labs.
7+
** This file is part of the Qt Script Generator project on Qt Labs.
68
**
7-
** This file may be used under the terms of the GNU General Public
8-
** License version 2.0 as published by the Free Software Foundation
9-
** and appearing in the file LICENSE.GPL included in the packaging of
10-
** this file. Please review the following information to ensure GNU
11-
** General Public Licensing requirements will be met:
12-
** http://www.trolltech.com/products/qt/opensource.html
9+
** $QT_BEGIN_LICENSE:LGPL$
10+
** No Commercial Usage
11+
** This file contains pre-release code and may not be distributed.
12+
** You may use this file in accordance with the terms and conditions
13+
** contained in the Technology Preview License Agreement accompanying
14+
** this package.
1315
**
14-
** If you are unsure which license is appropriate for your use, please
15-
** review the following information:
16-
** http://www.trolltech.com/products/qt/licensing.html or contact the
17-
** sales department at sales@trolltech.com.
16+
** GNU Lesser General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU Lesser
18+
** General Public License version 2.1 as published by the Free Software
19+
** Foundation and appearing in the file LICENSE.LGPL included in the
20+
** packaging of this file. Please review the following information to
21+
** ensure the GNU Lesser General Public License version 2.1 requirements
22+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1823
**
19-
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
20-
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
** In addition, as a special exception, Nokia gives you certain additional
25+
** rights. These rights are described in the Nokia Qt LGPL Exception
26+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27+
**
28+
** If you have questions regarding the use of this file, please contact
29+
** Nokia at qt-info@nokia.com.
30+
**
31+
**
32+
**
33+
**
34+
**
35+
**
36+
**
37+
**
38+
** $QT_END_LICENSE$
2139
**
2240
****************************************************************************/
2341

‎generator/asttoxml.cpp‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
3+
** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
4+
** All rights reserved.
5+
** Contact: Nokia Corporation (qt-info@nokia.com)
46
**
5-
** This file is part of the Qt Script Generator project on Trolltech Labs.
7+
** This file is part of the Qt Script Generator project on Qt Labs.
68
**
7-
** This file may be used under the terms of the GNU General Public
8-
** License version 2.0 as published by the Free Software Foundation
9-
** and appearing in the file LICENSE.GPL included in the packaging of
10-
** this file. Please review the following information to ensure GNU
11-
** General Public Licensing requirements will be met:
12-
** http://www.trolltech.com/products/qt/opensource.html
9+
** $QT_BEGIN_LICENSE:LGPL$
10+
** No Commercial Usage
11+
** This file contains pre-release code and may not be distributed.
12+
** You may use this file in accordance with the terms and conditions
13+
** contained in the Technology Preview License Agreement accompanying
14+
** this package.
1315
**
14-
** If you are unsure which license is appropriate for your use, please
15-
** review the following information:
16-
** http://www.trolltech.com/products/qt/licensing.html or contact the
17-
** sales department at sales@trolltech.com.
16+
** GNU Lesser General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU Lesser
18+
** General Public License version 2.1 as published by the Free Software
19+
** Foundation and appearing in the file LICENSE.LGPL included in the
20+
** packaging of this file. Please review the following information to
21+
** ensure the GNU Lesser General Public License version 2.1 requirements
22+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1823
**
19-
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
20-
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
** In addition, as a special exception, Nokia gives you certain additional
25+
** rights. These rights are described in the Nokia Qt LGPL Exception
26+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27+
**
28+
** If you have questions regarding the use of this file, please contact
29+
** Nokia at qt-info@nokia.com.
30+
**
31+
**
32+
**
33+
**
34+
**
35+
**
36+
**
37+
**
38+
** $QT_END_LICENSE$
2139
**
2240
****************************************************************************/
2341

‎generator/asttoxml.h‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
3+
** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
4+
** All rights reserved.
5+
** Contact: Nokia Corporation (qt-info@nokia.com)
46
**
5-
** This file is part of the Qt Script Generator project on Trolltech Labs.
7+
** This file is part of the Qt Script Generator project on Qt Labs.
68
**
7-
** This file may be used under the terms of the GNU General Public
8-
** License version 2.0 as published by the Free Software Foundation
9-
** and appearing in the file LICENSE.GPL included in the packaging of
10-
** this file. Please review the following information to ensure GNU
11-
** General Public Licensing requirements will be met:
12-
** http://www.trolltech.com/products/qt/opensource.html
9+
** $QT_BEGIN_LICENSE:LGPL$
10+
** No Commercial Usage
11+
** This file contains pre-release code and may not be distributed.
12+
** You may use this file in accordance with the terms and conditions
13+
** contained in the Technology Preview License Agreement accompanying
14+
** this package.
1315
**
14-
** If you are unsure which license is appropriate for your use, please
15-
** review the following information:
16-
** http://www.trolltech.com/products/qt/licensing.html or contact the
17-
** sales department at sales@trolltech.com.
16+
** GNU Lesser General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU Lesser
18+
** General Public License version 2.1 as published by the Free Software
19+
** Foundation and appearing in the file LICENSE.LGPL included in the
20+
** packaging of this file. Please review the following information to
21+
** ensure the GNU Lesser General Public License version 2.1 requirements
22+
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
1823
**
19-
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
20-
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
24+
** In addition, as a special exception, Nokia gives you certain additional
25+
** rights. These rights are described in the Nokia Qt LGPL Exception
26+
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
27+
**
28+
** If you have questions regarding the use of this file, please contact
29+
** Nokia at qt-info@nokia.com.
30+
**
31+
**
32+
**
33+
**
34+
**
35+
**
36+
**
37+
**
38+
** $QT_END_LICENSE$
2139
**
2240
****************************************************************************/
2341

0 commit comments

Comments
 (0)