diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 09:52:19 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 11:03:05 +0000 |
| commit | 4544a943ca2df4e6f0ac24914f0c0f844dc6f748 (patch) | |
| tree | 140904c3265894dbdd3ed7f864cbdb2ddc04a7c9 /examples/scriptableapplication/scriptableapplication.pro | |
| parent | 559c56b140410bcfa0ce6f19b47d1ba0daa9a201 (diff) | |
Binding Example helpers: Remove version numbers
- Rename the scripts
- Introduce variables for the versions in pyside_config.py
Change-Id: I1dcb8ca7eee259f25af0db7c09abd30484c7e99c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/scriptableapplication/scriptableapplication.pro')
| -rw-r--r-- | examples/scriptableapplication/scriptableapplication.pro | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/scriptableapplication/scriptableapplication.pro b/examples/scriptableapplication/scriptableapplication.pro index 067d9141f..148a22546 100644 --- a/examples/scriptableapplication/scriptableapplication.pro +++ b/examples/scriptableapplication/scriptableapplication.pro @@ -3,7 +3,7 @@ CONFIG += no_keywords # avoid clash with slots in Python.h CONFIG += console force_debug_info QT += widgets -include(pyside2.pri) +include(pyside.pri) WRAPPED_HEADER = wrappedclasses.h WRAPPER_DIR = $$OUT_PWD/AppLib @@ -17,13 +17,13 @@ qtConfig(framework): QT_INCLUDEPATHS += --framework-include-paths=$$[QT_INSTALL_ SHIBOKEN_OPTIONS = --generator-set=shiboken --enable-parent-ctor-heuristic \ --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero \ - $$QT_INCLUDEPATHS -I$$PWD -T$$PWD -T$$PYSIDE2/typesystems --output-directory=$$OUT_PWD + $$QT_INCLUDEPATHS -I$$PWD -T$$PWD -T$$PYSIDE/typesystems --output-directory=$$OUT_PWD # MSVC does not honor #define protected public... win32:SHIBOKEN_OPTIONS += --avoid-protected-hack # Prepare the shiboken tool -QT_TOOL.shiboken.binary = $$system_path($$SHIBOKEN6_GENERATOR/shiboken6) +QT_TOOL.shiboken.binary = $$system_path($$SHIBOKEN_GENERATOR/shiboken6) qtPrepareTool(SHIBOKEN, shiboken) # Shiboken run that adds the module wrapper to GENERATED_SOURCES @@ -51,7 +51,7 @@ defineReplace(getOutDir) { return($$out_dir) } -# Create hardlinks to the PySide2 shared libraries, so the example can be executed without manually +# Create hardlinks to the PySide shared libraries, so the example can be executed without manually # setting the PATH. win32 { out_dir = $$getOutDir() @@ -61,7 +61,7 @@ win32 { hard_link_libraries.CONFIG = no_link target_predeps explicit_dependencies hard_link_libraries.output = $$out_dir/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} hard_link_libraries.commands = mklink /H $$shell_path($$out_dir/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}) $$shell_path(${QMAKE_FILE_IN}) - hard_link_libraries.input = PYSIDE2_SHARED_LIBRARIES SHIBOKEN6_SHARED_LIBRARIES + hard_link_libraries.input = PYSIDE_SHARED_LIBRARIES SHIBOKEN6_SHARED_LIBRARIES } QMAKE_EXTRA_COMPILERS += shiboken module_wrapper_dummy_command @@ -69,7 +69,7 @@ win32:QMAKE_EXTRA_COMPILERS += hard_link_libraries INCLUDEPATH += $$WRAPPER_DIR -for(i, PYSIDE2_INCLUDE) { +for(i, PYSIDE_INCLUDE) { INCLUDEPATH += $$i/QtWidgets $$i/QtGui $$i/QtCore } @@ -82,4 +82,4 @@ HEADERS += \ mainwindow.h \ pythonutils.h -OTHER_FILES += $$TYPESYSTEM_FILE $$WRAPPED_HEADER pyside2_config.py README.md +OTHER_FILES += $$TYPESYSTEM_FILE $$WRAPPED_HEADER pyside_config.py README.md |