Skip to content

Commit 3aa5a23

Browse files
committed
m: Tpl
1 parent 61a2c89 commit 3aa5a23

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.github/workflows/windows.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ env:
99

1010
jobs:
1111
Windows_Qt6:
12-
name: Win 2019 Qt 6.7
13-
runs-on: windows-2019
12+
name: Win 2022 Qt 6
13+
runs-on: windows-2022
1414
steps:
1515
- name: Checkout repository
1616
uses: actions/checkout@v4
1717

1818
- name: Install Qt
1919
uses: jurplel/install-qt-action@v4
2020
with:
21-
version: '6.7.*'
21+
version: '6.8.*'
2222
modules: 'qtpositioning qtserialport qtwebchannel qtwebengine qtwebview'
2323

2424
- name: Install NuSpell using vcpkg
@@ -44,7 +44,7 @@ jobs:
4444
4545
- name: Create Package
4646
env:
47-
VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
47+
VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
4848
shell: cmd
4949
run: |
5050
mkdir InyokaEdit\plugins

application/parser/provisionaltplparser.cpp

+2-10
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,6 @@ auto ProvisionalTplParser::parsePkgInstall(const QStringList &sListArgs)
16141614
sListPackages.reserve(sListArgs.length());
16151615
QStringList sListPackagesTMP;
16161616
QString sOutput("");
1617-
QString sPackages("");
16181617

16191618
for (int i = 0; i < sListArgs.length(); i++) {
16201619
sListPackagesTMP.clear();
@@ -1629,10 +1628,6 @@ auto ProvisionalTplParser::parsePkgInstall(const QStringList &sListArgs)
16291628
}
16301629

16311630
sListPackages << sListPackagesTMP[0].trimmed();
1632-
sPackages += sListPackagesTMP[0].trimmed();
1633-
if (i < sListArgs.size() - 1) {
1634-
sPackages += ",";
1635-
}
16361631
}
16371632

16381633
sOutput += "\n<p>" +
@@ -1642,11 +1637,8 @@ auto ProvisionalTplParser::parsePkgInstall(const QStringList &sListArgs)
16421637
"<div class=\"bash\">\n"
16431638
"<pre class=\"notranslate\"> sudo apt-get install " +
16441639
sListPackages.join(' ') + "</pre>\n</div>\n";
1645-
sOutput += "<p>" + QString::fromUtf8(
1646-
"Oder mit [:apturl:] installieren, "
1647-
"Link: [apt://");
1648-
sOutput += sPackages;
1649-
return sOutput + "]</p>\n";
1640+
1641+
return sOutput;
16501642
}
16511643

16521644
// ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)