diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-09 14:29:21 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-03-20 08:19:25 +0000 |
| commit | 5a4787dca01c302dd462a76222dfbf28c8951a8d (patch) | |
| tree | 897b7caea659526d740e98c06b11c15970d35a7b /tests | |
| parent | dd74f5d347d0a5a21527142f85114374e2d90646 (diff) | |
Modernize the "regularexpression" feature
Use QT_CONFIG(regularexpression), disentangle it from QT_BOOTSTRAPPED,
switch it off in the bootstrap build, remove the #ifdefs from
qregularexpression.{h|cpp}, and add QT_REQUIRE_CONFIG(regularexpression)
to the header.
qregularexpression.{h|cpp} are already correctly excluded in tools.pri
if !qtConfig(regularexpression).
Change-Id: I21de154a6a118b76f99003d3acb72ac1e220d302
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/shared/emulationdetector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/shared/emulationdetector.h b/tests/shared/emulationdetector.h index bf1192a0b2..cca11be695 100644 --- a/tests/shared/emulationdetector.h +++ b/tests/shared/emulationdetector.h @@ -32,7 +32,7 @@ #if defined(Q_OS_LINUX) && defined(Q_PROCESSOR_ARM) #define SHOULD_CHECK_ARM_ON_X86 -#if QT_CONFIG(process) && !defined(QT_NO_REGULAREXPRESSION) +#if QT_CONFIG(process) && QT_CONFIG(regularexpression) #include <QProcess> #include <QRegularExpression> #endif @@ -88,7 +88,7 @@ static bool isX86SpecificFileAvailable() */ static bool isReportedArchitectureX86(void) { -#if QT_CONFIG(process) && !defined(QT_NO_REGULAREXPRESSION) +#if QT_CONFIG(process) && QT_CONFIG(regularexpression) QProcess unamer; QString machineString; |