Skip to content

Commit c07de89

Browse files
committed
Allow resolution of the Qt minor version
1 parent 30adfda commit c07de89

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

build/common.prf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,19 @@ isEmpty(PYTHONQT_GENERATED_PATH) {
2929

3030
# Fallbacks to checked-in wrappers
3131
!exists($$PYTHONQT_GENERATED_PATH) {
32-
# Exact version directory (e.g., generated_cpp_515 or generated_cpp_69)
33-
PYTHONQT_GENERATED_PATH_VERSIONED = $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}$${QT_MINOR_VERSION}
34-
exists($$PYTHONQT_GENERATED_PATH_VERSIONED) {
35-
PYTHONQT_GENERATED_PATH = $$PYTHONQT_GENERATED_PATH_VERSIONED
32+
# If no files are generated, try the checked-in wrappers:
33+
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
34+
35+
!exists($$PYTHONQT_GENERATED_PATH) {
36+
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
3637
}
3738
}
3839

3940
!exists($$PYTHONQT_GENERATED_PATH) {
4041
error("No generated wrapper sources for Qt $${QT_VERSION}.\n" \
4142
"Looked in:\n" \
4243
" - $$PWD/../generated_cpp\n" \
43-
" - $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}$${QT_MINOR_VERSION} (e.g., generated_cpp_515)\n" \
44+
" - $$PWD/../generated_cpp_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION} (e.g., generated_cpp_5.15)\n" \
4445
"Generate them first:\n" \
4546
" qmake CONFIG+=generator_only && make\n" \
4647
" cd generator && ./pythonqt_generator\n" \

0 commit comments

Comments
 (0)