Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ jobs:
with:
name: qt-core-vsix
path: qt-core/out/*.vsix
- name: Upload qt-ui
uses: actions/upload-artifact@v4
with:
name: qt-ui-vsix
path: qt-ui/out/*.vsix
- name: Upload qt-python
uses: actions/upload-artifact@v4
with:
Expand Down
18 changes: 4 additions & 14 deletions .github/workflows/qt-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ on:
- qt-core
- qt-cpp
- qt-qml
- qt-ui
- qt-python

jobs:
Expand Down Expand Up @@ -102,10 +101,9 @@ jobs:
- name: Prepare NatVis files
run: npm run prepareNatvisFiles
# Compile other extensions once (runtime build)
- name: Compile qt-cpp / qt-ui / qt-qml / qt-python
- name: Compile qt-cpp / qt-qml / qt-python
run: |
npm --prefix qt-cpp run compile
npm --prefix qt-ui run compile
npm --prefix qt-qml run compile
npm --prefix qt-python run compile

Expand Down Expand Up @@ -140,8 +138,8 @@ jobs:
echo "Directory tree (maxdepth 3) under $QT_ROOT:"
find "$QT_ROOT" -maxdepth 3 -type d -print

- name: Verify Designer is available (qt-ui only)
if: env.TEST_SUITE == 'all' || env.TEST_SUITE == 'qt-ui'
- name: Verify Designer is available qt-core only)
if: env.TEST_SUITE == 'all' || env.TEST_SUITE == 'qt-core'
shell: bash
run: |
set -euo pipefail
Expand All @@ -154,7 +152,7 @@ jobs:
if [[ -n "$DESIGNER" ]]; then
echo "Found Designer at: $DESIGNER"
else
echo "::error::Designer not found under $QT_ROOT after install, but qt-ui tests were selected."
echo "::error::Designer not found under $QT_ROOT after install, but qt-core tests were selected."
exit 1
fi

Expand Down Expand Up @@ -222,10 +220,6 @@ jobs:
run_cmd "${XVFB[@]}" npm --prefix qt-qml run test:only
fi

if should_run qt-ui; then
run_cmd "${XVFB[@]}" npm --prefix qt-ui run test:only
fi

if should_run qt-python; then
run_cmd "${XVFB[@]}" npm --prefix qt-python run test:only
fi
Expand All @@ -242,10 +236,6 @@ jobs:
run_cmd npm --prefix qt-qml run test:only
fi

if should_run qt-ui; then
run_cmd npm --prefix qt-ui run test:only
fi

if should_run qt-python; then
run_cmd npm --prefix qt-python run test:only
fi
Expand Down
24 changes: 0 additions & 24 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,6 @@
"outFiles": ["${workspaceFolder}/qt-qml/out/**/*.js"],
"preLaunchTask": "npm qt-qml watch"
},
{
"name": "Run qt-ui",
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}/qt-ui"],
"outFiles": ["${workspaceFolder}/qt-ui/out/**/*.js"],
"cwd": "${workspaceFolder}/qt-ui",
"preLaunchTask": "npm qt-ui watch"
},
{
"name": "Run qt-python",
"type": "extensionHost",
Expand Down Expand Up @@ -146,21 +137,6 @@
],
"outFiles": ["${workspaceFolder}/qt-qml/out/test/**/*.js"],
"preLaunchTask": "npm qt-qml watch and test"
},
{
"name": "Run Extension Tests qt-ui",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}/qt-ui",
"--extensionTestsPath=${workspaceFolder}/qt-ui/out/test/suite/index"
],
"env": {
"QT_TESTING": "1"
},
"outFiles": ["${workspaceFolder}/qt-ui/out/test/**/*.js"],
"preLaunchTask": "npm qt-ui watch and test"
}
]
}
34 changes: 0 additions & 34 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,23 +134,6 @@
"cwd": "${workspaceFolder}/qt-core"
}
},
{
"type": "shell",
"label": "npm qt-ui watch",
"problemMatcher": "$tsc-watch",
"command": "npm run watch",
"isBackground": true,
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
},
"options": {
"cwd": "${workspaceFolder}/qt-ui"
}
},
{
"type": "shell",
"label": "vite:start",
Expand All @@ -169,23 +152,6 @@
"cwd": "${workspaceFolder}"
}
},
{
"type": "shell",
"label": "npm qt-ui watch and test",
"problemMatcher": "$tsc-watch",
"command": "npm run watch && npm run compile-test",
"isBackground": true,
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
},
"options": {
"cwd": "${workspaceFolder}/qt-ui"
}
},
{
"type": "shell",
"label": "npm qt-python watch",
Expand Down
1 change: 0 additions & 1 deletion extension_packs/cpp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"theqtcompany.qt-cpp",
"theqtcompany.qt-qml",
"theqtcompany.qt-core",
"theqtcompany.qt-ui",
"ms-vscode.cmake-tools",
"ms-vscode.cpptools"
],
Expand Down
1 change: 0 additions & 1 deletion extension_packs/python/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"theqtcompany.qt-python",
"theqtcompany.qt-core",
"theqtcompany.qt-qml",
"theqtcompany.qt-ui",
"ms-vscode.python"
],
"scripts": {
Expand Down
3 changes: 1 addition & 2 deletions extension_packs/qt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
"theqtcompany.qt-core",
"theqtcompany.qt-cpp",
"theqtcompany.qt-qml",
"theqtcompany.qt-python",
"theqtcompany.qt-ui"
"theqtcompany.qt-python"
],
"scripts": {
"vscode:prepublish": "git rev-parse HEAD > commit",
Expand Down
1 change: 0 additions & 1 deletion extension_packs/wasm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"theqtcompany.qt-cpp",
"theqtcompany.qt-qml",
"theqtcompany.qt-core",
"theqtcompany.qt-ui",
"ms-vscode.cmake-tools",
"ms-vscode.cpptools",
"ms-vscode.wasm-dwarf-debugging",
Expand Down
Loading
Loading