Skip to content

Commit 4fc8297

Browse files
committed
chore(build/common.prf): drop Qt5 versioned wrapper fallbacks; rely on explicit/generated path
Remove the hard-coded auto-selection of checked-in wrapper sets (`generated_cpp_50`, `_54`, `_56`, `_511`, `_515`) for Qt5. The build now relies solely on: * an explicit `PYTHONQT_GENERATED_PATH` provided by the caller, **or** * the default `$$PWD/../generated_cpp` when it exists, and otherwise fails fast with a clear error message listing where we looked.
1 parent 545cb9a commit 4fc8297

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

build/common.prf

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,6 @@ isEmpty(PYTHONQT_GENERATED_PATH) {
3131
}
3232
}
3333

34-
!exists($$PYTHONQT_GENERATED_PATH) {
35-
# For Qt5 we know that the older generated wrappers work with the later
36-
# versions, even (apparently) Qt5.15, so:
37-
equals(QT_MAJOR_VERSION, 5) {
38-
# Qt5: have 5.0, 5.3, 5.4, 5.6 and 5.11 at present:
39-
lessThan(QT_MINOR_VERSION, 3) { # 5.1, 5.2
40-
PYTHONQT_GENERATED_PATH_VERSIONED = $$PWD/../generated_cpp_50
41-
}
42-
else: lessThan(QT_MINOR_VERSION, 6) { # 5.3, 5.4, 5.5
43-
PYTHONQT_GENERATED_PATH_VERSIONED = $$PWD/../generated_cpp_54
44-
}
45-
else: lessThan(QT_MINOR_VERSION, 11) { # 5.6, 5.7, 5.8, 5.9, 5.10
46-
PYTHONQT_GENERATED_PATH_VERSIONED = $$PWD/../generated_cpp_56
47-
}
48-
else: lessThan(QT_MINOR_VERSION, 15) { # 5.11, 5.12, 5.13, 5.14
49-
PYTHONQT_GENERATED_PATH_VERSIONED = $$PWD/../generated_cpp_511
50-
}
51-
else { # >= 5.15
52-
PYTHONQT_GENERATED_PATH_VERSIONED = $$PWD/../generated_cpp_515
53-
}
54-
exists($$PYTHONQT_GENERATED_PATH_VERSIONED) {
55-
PYTHONQT_GENERATED_PATH = $$PYTHONQT_GENERATED_PATH_VERSIONED
56-
}
57-
}
58-
}
59-
6034
!exists($$PYTHONQT_GENERATED_PATH) {
6135
error("No generated wrapper sources for Qt $${QT_VERSION}.\n" \
6236
"Looked in:\n" \

0 commit comments

Comments
 (0)