diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-15 18:01:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-17 06:56:35 +0200 |
| commit | 099d6c09f704a6f8ace929e5522c5fd655e14215 (patch) | |
| tree | 27898c44c951dbb0a8f6f111cc869b48c9ea7682 /build_scripts/options.py | |
| parent | cbcb9ccd3a89be02ce0ee770f866d78177f56bf2 (diff) | |
build scripts: Replace qmake mkspec parsing by cmake
Determine build type and macOS target by creating a cmake
dummy project instead of a qmake one.
Task-number: QTBUG-75870
Change-Id: Ia25124e42dd10bf503f7e613b0edcec88a005633
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'build_scripts/options.py')
| -rw-r--r-- | build_scripts/options.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_scripts/options.py b/build_scripts/options.py index a6c29aafb..1e32d5e92 100644 --- a/build_scripts/options.py +++ b/build_scripts/options.py @@ -298,7 +298,7 @@ class DistUtilsCommandMixin(object): qmake_abs_path = os.path.abspath(self.qmake) OPTION['QMAKE'] = qmake_abs_path OPTION['QT_VERSION'] = self.qt - QtInfo().setup(qmake_abs_path) + QtInfo().setup(self.cmake, qmake_abs_path) OPTION['CMAKE'] = os.path.abspath(self.cmake) OPTION['OPENSSL'] = self.openssl OPTION['SHIBOKEN_CONFIG_DIR'] = self.shiboken_config_dir |