Skip to content

Use versionless Qt installation path for build #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcprux wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use versionless Qt installation path for build #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .swift-version
View file
Open in desktop

This file was deleted.

20 changes: 12 additions & 8 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@ let package = Package(
cxxSettings: [
.unsafeFlags([
"-std=c++17",
"-I/opt/homebrew/Cellar/qt/6.9.1/include",
"-I/opt/homebrew/Cellar/qt/6.9.1/include/QtCore",
"-I/opt/homebrew/Cellar/qt/6.9.1/include/QtWidgets",
"-I/opt/homebrew/Cellar/qt/6.9.1/include/QtGui",
"-I/opt/homebrew/Cellar/qt/6.9.1/include/QtTest",
"-F/opt/homebrew/Cellar/qt/6.9.1/lib",
"-I/opt/homebrew/opt/qt/include",
"-I/opt/homebrew/opt/qt/include/QtCore",
"-I/opt/homebrew/opt/qt/lib/QtCore.framework/Headers",
"-I/opt/homebrew/opt/qt/include/QtWidgets",
"-I/opt/homebrew/opt/qt/lib/QtWidgets.framework/Headers",
"-I/opt/homebrew/opt/qt/include/QtGui",
"-I/opt/homebrew/opt/qt/lib/QtGui.framework/Headers",
"-I/opt/homebrew/opt/qt/include/QtTest",
"-I/opt/homebrew/opt/qt/lib/QtTest.framework/Headers",
"-F/opt/homebrew/opt/qt/lib",
])
],
swiftSettings: [
Expand All @@ -35,7 +39,7 @@ let package = Package(
],
linkerSettings: [
.unsafeFlags([
"-F/opt/homebrew/Cellar/qt/6.9.1/lib",
"-F/opt/homebrew/opt/qt/lib",
"-framework", "QtCore",
"-framework", "QtWidgets",
"-framework", "QtGui",
Expand Down Expand Up @@ -71,7 +75,7 @@ let package = Package(
],
linkerSettings: [
.unsafeFlags([
"-F/opt/homebrew/Cellar/qt/6.9.1/lib",
"-F/opt/homebrew/opt/qt/lib",
"-framework", "QtTest", // Link Qt Test framework
])
]
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ https://github.com/user-attachments/assets/a44f46ac-f1fb-4c79-9c0a-825117e95283

This is hardcoded for now:

The Package.swift is configured to expect the qt6 headers in a location used by Homebrew (brew install qt): `opt/homebrew/Cellar/qt/6.9.1` for macOS
The Package.swift is configured to expect the qt6 headers in a location used by Homebrew (brew install qt): `/opt/homebrew/opt/qt` for macOS

On Linux, the path is set to `/usr/include/qt6` which is the default on Fedora.

Expand Down
2 changes: 1 addition & 1 deletion Sources/QtBridge/QtTestBridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,4 +608,4 @@ SwiftQTestFinder* createTestFinderWithRoot(SwiftQWidget* root) {

SwiftQTestSimulator* createTestSimulator() {
return new SwiftQTestSimulator();
}
}