diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 999fb60..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -main-snapshot-2025-07-26 \ No newline at end of file diff --git a/Package.swift b/Package.swift index daeef15..fddb946 100644 --- a/Package.swift +++ b/Package.swift @@ -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: [ @@ -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", @@ -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 ]) ] diff --git a/README.md b/README.md index 5d77086..ee2414d 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/Sources/QtBridge/QtTestBridge.cpp b/Sources/QtBridge/QtTestBridge.cpp index 2b7a26f..c1de031 100644 --- a/Sources/QtBridge/QtTestBridge.cpp +++ b/Sources/QtBridge/QtTestBridge.cpp @@ -608,4 +608,4 @@ SwiftQTestFinder* createTestFinderWithRoot(SwiftQWidget* root) { SwiftQTestSimulator* createTestSimulator() { return new SwiftQTestSimulator(); -} \ No newline at end of file +}