Skip to content

Commit b964981

Browse files
committed
Remove the QextSerialPort license
1 parent 80b6198 commit b964981

File tree

9 files changed

+3
-113
lines changed

9 files changed

+3
-113
lines changed

NOTICE

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ This software may use following third-party components:
55
* QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in installer/licenses/QtPropertyBrowser-license.txt.
66
* QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in installer/licenses/QsKineticScroller-license.txt.
77
* WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in installer/licenses/WindowsModernStyle-license.txt.
8-
* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang.
9-
It is licensed under MIT License. Copy of this license can be found in installer/licenses/QextSerialPort-license.txt.
108

119
It also uses Pfennig font by Daniel Johnson, licensed under SIL Open Font License (OFL). Copy of this license can be found in installer/licenses/OFL.txt.
1210

@@ -15,4 +13,4 @@ Some icons are provided by Tatiana Yanchuk and are available under Creative Comm
1513
We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
1614

1715
Considering license information, our product is licensed under Apache License v2.0 (installer/licenses/ApacheLicense-v2.0.txt).
18-
Its source code is available at our GitHub repository: https://github.com/qreal/qreal
16+
Its source code is available at our GitHub repository: https://github.com/qreal/qreal

installer/licenses/QextSerialPort-license.txt

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

installer/licenses/acknowledgements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ This software may use following third-party components:
55
* QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in licenses/QtPropertyBrowser-license.txt.
66
* QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in licenses/QsKineticScroller-license.txt.
77
* WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in licenses/WindowsModernStyle-license.txt.
8-
* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang.
9-
It is licensed under MIT License. Copy of this license can be found in licenses/QextSerialPort-license.txt.
108

119
It also uses Pfennig font by Daniel Johnson, licensed under SIL Open Font License (OFL). Copy of this license can be found in licenses/OFL.txt.
1210

@@ -21,4 +19,4 @@ Thanks to ALT Linux maintainer Anton Midyukov for his work on integration TRIK S
2119
We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
2220

2321
Considering license information, our product is licensed under Apache License v2.0 (licenses/ApacheLicense-v2.0.txt).
24-
Its source code is available at our GitHub repository: https://github.com/qreal/qreal
22+
Its source code is available at our GitHub repository: https://github.com/qreal/qreal

installer/packages/trik-studio/ru.qreal.root.ev3/meta/package.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<Description xml:lang="ru_ru">Установите это для работы с конструктором Lego EV3</Description>
77
<Version></Version>
88
<ReleaseDate>2017-11-14</ReleaseDate>
9-
<Licenses>
10-
<License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
11-
</Licenses>
129
<SortingPriority>17</SortingPriority>
1310
<Default>true</Default>
1411
<ForcedInstallation>false</ForcedInstallation>

installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-common.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ set -o errexit
44

55
cd "$(dirname "$0")"
66

7-
rsync -a "$INSTALLER_ROOT"/licenses/QextSerialPort-license*.txt "$PWD"
8-
9-
107
mkdir -p "$PWD"/../data/plugins/editors
118
mkdir -p "$PWD"/../data/plugins/tools/kitPlugins
129
mkdir -p "$PWD"/../data/examples

installer/packages/trik-studio/ru.qreal.root.ev3/meta/prebuild-linux-gnu.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-interpreter.so "$PW
1212
rsync -a "$BIN_DIR"/plugins/tools/kitPlugins/librobots-ev3-rbf-generator.so "$PWD"/../data/lib/plugins/tools/kitPlugins/
1313
rsync -a "$BIN_DIR"/librobots-ev3-kit.so* "$PWD"/../data/lib
1414
rsync -a "$BIN_DIR"/librobots-ev3-generator-base.so* "$PWD"/../data/lib
15-
rsync -a "$BIN_DIR"/libqextserialport.so* "$PWD"/../data/lib
1615

1716
cp -L "$(pkg-config --variable=libdir libusb-1.0)/libusb-1.0.so" "$PWD"/../data/lib/libusb-1.0.so
1817

installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/package.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
<Description xml:lang="ru_ru">Поддержка конструктора Lego NXT</Description>
77
<Version></Version>
88
<ReleaseDate>2017-11-14</ReleaseDate>
9-
<Licenses>
10-
<License name="QextSerialPort Component License" file="QextSerialPort-license.txt" />
11-
</Licenses>
129
<SortingPriority>9</SortingPriority>
1310
<Default>false</Default>
1411
<ForcedInstallation>false</ForcedInstallation>

installer/packages/trik-studio/ru.qreal.root.nxt.core/meta/prebuild-common.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ set -o errexit
44

55
cd "$(dirname "$0")"
66

7-
rsync -a "$INSTALLER_ROOT"/licenses/QextSerialPort-license*.txt "$PWD"
8-
97
mkdir -p "$PWD"/../data/plugins/editors
108
mkdir -p "$PWD"/../data/plugins/tools/kitPlugins

plugins/robots/interpreters/trikKitInterpreterCommon/src/trikKitInterpreter.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ includes(plugins/robots/common/kitBase \
2222
plugins/robots/interpreters/trikKitInterpreter/src)
2323

2424
links(qrkernel qrutils qrtext qrgui-preferences-dialog qrgui-tool-plugin-interface \
25-
robots-utils robots-kit-base robots-2d-model robots-trik-kit qextserialport qslog \
25+
robots-utils robots-kit-base robots-2d-model robots-trik-kit qslog \
2626
)
2727

2828
HEADERS += \

0 commit comments

Comments
 (0)