From c3fb91e1655fb55c4abf197ebcfc5f99967106d3 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sun, 9 Feb 2020 18:34:00 +0000 Subject: [PATCH] [qmake] skip some steps during QtCreator initial parse phase --- mkspecs/features/version.pri | 2 +- swift.pro | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mkspecs/features/version.pri b/mkspecs/features/version.pri index a947faa1f..fbb222323 100644 --- a/mkspecs/features/version.pri +++ b/mkspecs/features/version.pri @@ -22,7 +22,7 @@ VER_MIN = $$swiftConfig(version.minor) VER_PAT = $$swiftConfig(version.micro) VERSION = $$swiftConfig(version.full) -!isEmpty(GIT_BIN) { +!qtc_run: !isEmpty(GIT_BIN) { isEmpty(VER_REV) { VER_REV = $$gitRevCount() cache(VER_REV) diff --git a/swift.pro b/swift.pro index 6c5bf3332..007e71cde 100644 --- a/swift.pro +++ b/swift.pro @@ -9,10 +9,12 @@ OTHER_FILES += *.supp OTHER_FILES += .astylerc OTHER_FILES += $$SWIFT_CONFIG_JSON -CheckMandatoryDependency(gl) -CheckMandatoryDependency(glu) -CheckMandatoryDependency(libpng) -CheckMandatoryDependency(zlib) +!qtc_run { + CheckMandatoryDependency(gl) + CheckMandatoryDependency(glu) + CheckMandatoryDependency(libpng) + CheckMandatoryDependency(zlib) +} swiftConfig(doxygen) { SUBDIRS += docs