Visitar URL original
TEST ONLY: this adds the PR139 generated files to the master branch by jbowler · Pull Request #140 · MeVisLab/pythonqt · GitHub
Skip to content

TEST ONLY: this adds the PR139 generated files to the master branch #140

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

Closed
jbowler wants to merge 5 commits into from
Closed

TEST ONLY: this adds the PR139 generated files to the master branch #140

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e78f064
generated_cpp_511 from Qt5.11.3
jbowler Nov 2, 2023
89562aa
generated_cpp_512 from Qt5.12.12 source
jbowler Nov 2, 2023
082005f
Add use of 5.12 generated headers in build.
jbowler Nov 2, 2023
82b58fe
generated_cpp_513 files from Qt5.13.2
jbowler Nov 2, 2023
d29cf54
Merge branch 'MeVisLab:master' into pull-request-140
jbowler Nov 10, 2023
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
Prev Previous commit
Next Next commit
Add use of 5.12 generated headers in build. 
Signed-off-by: John Bowler <jbowler@acm.org>
  • Loading branch information
@jbowler
jbowler committed Nov 2, 2023
commit 082005f7eac99200330ba52a8b2fb77f25d1ea86
7 changes: 5 additions & 2 deletions build/common.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp
else: lessThan(QT_MINOR_VERSION, 11) { # 5.7, 5.8, 5.9, 5.10
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_56
}
else { # >5.11
# LATEST Qt5 generated files:
else: lessThan(QT_MINOR_VERSION, 12) { # 5.11
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_511
}
else { # >5.12
# LATEST Qt5 generated files:
PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp_512
}
}

!exists($$PYTHONQT_GENERATED_PATH) {
Expand Down