diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2022-11-30 11:15:10 +0300 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-12-16 15:08:08 +0000 |
commit | abc990e11f20dc20440cabceedcecab84e6f78e3 (patch) | |
tree | ddb1161f6ed182ff9fc1009c2f04c3977c5c19b6 /src/lib/scriptengine | |
parent | 08c8fd38b5175834800ecf5147cdc5ff32b0b112 (diff) |
RIP QMake build
We have been supported CMake build for quite some time
so users should have plenty of time to adapt.
Ubuntu, Brew and macports also use CMake for building QBS.
Change-Id: Ib78177f4a7ca8cdea1a2f3a8eac8bfe804674f32
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/scriptengine')
-rw-r--r-- | src/lib/scriptengine/scriptengine.pro | 98 | ||||
-rw-r--r-- | src/lib/scriptengine/use_scriptengine.pri | 30 |
2 files changed, 0 insertions, 128 deletions
diff --git a/src/lib/scriptengine/scriptengine.pro b/src/lib/scriptengine/scriptengine.pro deleted file mode 100644 index 34fd5a5f8..000000000 --- a/src/lib/scriptengine/scriptengine.pro +++ /dev/null @@ -1,98 +0,0 @@ -TARGET = qbsscriptengine -include(../library.pri) - -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 -DEFINES += QT_NO_USING_NAMESPACE - -CONFIG += building-libs - -GENERATED_SOURCES_DIR = generated - -CONFIG += QTDIR_build -include(../../shared/qtscript/src/3rdparty/javascriptcore/WebKit.pri) - -# Disable a few warnings on Windows. -# These are in addition to the ones disabled in WebKit.pri -msvc: QMAKE_CXXFLAGS += -wd4396 -wd4099 -else: QMAKE_CXXFLAGS += -Wno-deprecated - -# We cannot afford -O0 for QtScript even in debug builds. -QMAKE_CXXFLAGS_DEBUG += -O2 - -darwin { - DEFINES += ENABLE_JSC_MULTIPLE_THREADS=0 - contains(QT_CONFIG, coreservices) { - LIBS_PRIVATE += -framework CoreServices - } else { - LIBS_PRIVATE += -framework CoreFoundation - } -} -win32 { - LIBS += -lwinmm -} - -# Suppress 'LEAK' messages (see QTBUG-18201) -DEFINES += LOG_DISABLED=1 - -JAVASCRIPTCORE_JIT = no -include(../../shared/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri) - -# This line copied from WebCore.pro -DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 - -CONFIG(release, debug|release): DEFINES += NDEBUG - -# Avoid JSC C API functions being exported. -DEFINES += JS_NO_EXPORT - -!build_pass { - versionAtLeast(QT_VERSION, 6.1.0) { - qtPrepareLibExecTool(QMAKE_SYNCQT, syncqt, , system) - } else { - qtPrepareTool(QMAKE_SYNCQT, syncqt, , system) - } - QMAKE_SYNCQT += \ - -minimal -version $$[QT_VERSION] \ - -outdir $$system_quote($$system_path($$OUT_PWD)) \ - $$system_quote($$system_path($$clean_path($$PWD/../../shared/qtscript))) - !system($$QMAKE_SYNCQT): error("Failed to execute syncqt for the bundled QtScript module.") -} - -INCLUDEPATH += \ - $$PWD/include \ - $$OUT_PWD/include \ - $$OUT_PWD/include/QtScript/$$[QT_VERSION]/QtScript \ - $$PWD/../../shared/qtscript/src/script \ - $$PWD/../../shared/qtscript/src/script/api - -include(../../shared/qtscript/src/script/api/api.pri) -include(../../shared/qtscript/src/script/parser/parser.pri) - -BRIDGESRCDIR = ../../shared/qtscript/src/script/bridge -SOURCES += \ - $$BRIDGESRCDIR/qscriptactivationobject.cpp \ - $$BRIDGESRCDIR/qscriptclassobject.cpp \ - $$BRIDGESRCDIR/qscriptfunction.cpp \ - $$BRIDGESRCDIR/qscriptglobalobject.cpp \ - $$BRIDGESRCDIR/qscriptobject.cpp \ - $$BRIDGESRCDIR/qscriptqobject.cpp \ - $$BRIDGESRCDIR/qscriptstaticscopeobject.cpp \ - $$BRIDGESRCDIR/qscriptvariant.cpp - -HEADERS += \ - $$BRIDGESRCDIR/qscriptactivationobject_p.h \ - $$BRIDGESRCDIR/qscriptclassobject_p.h \ - $$BRIDGESRCDIR/qscriptfunction_p.h \ - $$BRIDGESRCDIR/qscriptglobalobject_p.h \ - $$BRIDGESRCDIR/qscriptobject_p.h \ - $$BRIDGESRCDIR/qscriptqobject_p.h \ - $$BRIDGESRCDIR/qscriptstaticscopeobject_p.h \ - $$BRIDGESRCDIR/qscriptvariant_p.h diff --git a/src/lib/scriptengine/use_scriptengine.pri b/src/lib/scriptengine/use_scriptengine.pri deleted file mode 100644 index 9981b442a..000000000 --- a/src/lib/scriptengine/use_scriptengine.pri +++ /dev/null @@ -1,30 +0,0 @@ -include(../bundledlibs.pri) - -qbs_use_bundled_qtscript:!qbs_do_not_link_bundled_qtscript { - include(../../library_dirname.pri) - isEmpty(QBSLIBDIR) { - QBSLIBDIR = $$shadowed($$PWD/../../../$${QBS_LIBRARY_DIRNAME}) - } - - versionAtLeast(QT_VERSION, 6.0.0) { - QT *= core5compat - } - - LIBS += -L$$QBSLIBDIR - macos { - LIBS += -lqbsscriptengine - } - else { - LIBS += -lqbsscriptengine$$qtPlatformTargetSuffix() - } - - isEmpty(QBS_RPATH): QBS_RPATH = ../$$QBS_LIBRARY_DIRNAME - !qbs_disable_rpath { - linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$${QBS_RPATH}\' - macos: QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$${QBS_RPATH} - } -} - -INCLUDEPATH += \ - $$PWD/include \ - $$shadowed($$PWD/include) |