Skip to content

Commit f173927

Browse files
jcfrhjmjohnson
authored andcommitted
chore(build/common.prf): Simplify check for checked-in wrappers
1 parent f2cdc33 commit f173927

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

build/common.prf

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,8 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp
2323
!exists($$PYTHONQT_GENERATED_PATH) {
2424
# If no files are generated, try the checked-in wrappers:
2525
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}$${QT_MINOR_VERSION}
26-
2726
!exists($$PYTHONQT_GENERATED_PATH) {
28-
# For Qt5 we know that the older generated wrappers work with the later
29-
# versions, even (apparently) Qt5.15, so:
30-
equals(QT_MAJOR_VERSION, 5) {
31-
# Qt5: have 5.0, 5.3, 5.4, 5.6 and 5.11 at present:
32-
lessThan(QT_MINOR_VERSION, 3) { # 5.1, 5.2
33-
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_50
34-
}
35-
else: lessThan(QT_MINOR_VERSION, 6) { # 5.5
36-
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_54
37-
}
38-
else: lessThan(QT_MINOR_VERSION, 11) { # 5.7, 5.8, 5.9, 5.10
39-
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
40-
}
41-
else: lessThan(QT_MINOR_VERSION, 15) { # 5.11, 5.12, 5.13, 5.14
42-
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
43-
}
44-
else { # 5.15
45-
# LATEST Qt5 generated files:
46-
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_515
47-
}
48-
}
49-
50-
!exists($$PYTHONQT_GENERATED_PATH) {
51-
error("No generated sources exist for Qt$${QT_VERSION}")
52-
}
27+
error("No generated sources exist for Qt$${QT_VERSION}")
5328
}
5429
}
5530

0 commit comments

Comments
 (0)