diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-11-03 15:11:03 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-11-03 14:13:05 +0000 |
| commit | ae937f07673aa95b67218e4be36a38e4438c0171 (patch) | |
| tree | 51948fdcbe8fba5e8f4dd629253cccce0ae6bc71 | |
| parent | b297983257872e8c8dfe3975dde661c6a6cbe423 (diff) | |
| download | qbs-ae937f07673aa95b67218e4be36a38e4438c0171.tar.gz | |
qmake: fix Qt6 build
Task-number: QTCREATORBUG-26516
Change-Id: Id7cef7eff941dd43f61c9ee7029066a6b248b181
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/scriptengine/scriptengine.pro | 5 | ||||
| -rw-r--r-- | src/lib/scriptengine/use_scriptengine.pri | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/scriptengine/scriptengine.pro b/src/lib/scriptengine/scriptengine.pro index b1e6e8bad..34fd5a5f8 100644 --- a/src/lib/scriptengine/scriptengine.pro +++ b/src/lib/scriptengine/scriptengine.pro @@ -1,9 +1,12 @@ TARGET = qbsscriptengine include(../library.pri) -INSTALLS = QT = core-private +versionAtLeast(QT_VERSION, 6.0.0) { + QT += core5compat +} + DEFINES += QT_BUILD_SCRIPT_LIB DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF diff --git a/src/lib/scriptengine/use_scriptengine.pri b/src/lib/scriptengine/use_scriptengine.pri index e763c9d86..ff1bb1343 100644 --- a/src/lib/scriptengine/use_scriptengine.pri +++ b/src/lib/scriptengine/use_scriptengine.pri @@ -4,6 +4,10 @@ QBSLIBDIR = $$shadowed($$PWD/../../../$${QBS_LIBRARY_DIRNAME}) } + versionAtLeast(QT_VERSION, 6.0.0) { + QT *= core5compat + } + LIBS += -L$$QBSLIBDIR macos { LIBS += -lqbsscriptengine |