1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with -no-feature-regularexpression

Browse Source 
The thing we are looking for in qstandardpaths_unix.cpp is
regularexpression, not QT_BOOTSTRAPPED.

Change-Id: I37eb0cdd8a52b0adfd69f592b84659e8807e35ad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Ulf Hermann 2017-12-20 10:37:54 +01:00
parent 74027e7f99
commit ca47afbfaa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/global/qconfig-bootstrapped.h
View File

@ -89,6 +89,7 @@
#define QT_FEATURE_library -1 #define QT_FEATURE_library -1
#define QT_NO_QOBJECT #define QT_NO_QOBJECT
#define QT_FEATURE_process -1 #define QT_FEATURE_process -1
#define QT_FEATURE_regularexpression -1
#define QT_FEATURE_renameat2 -1 #define QT_FEATURE_renameat2 -1
#define QT_FEATURE_sharedmemory -1 #define QT_FEATURE_sharedmemory -1
#define QT_FEATURE_slog2 -1 #define QT_FEATURE_slog2 -1

4
src/corelib/io/qstandardpaths_unix.cpp
View File

@ -170,7 +170,7 @@ QString QStandardPaths::writableLocation(StandardLocation type)
break; break;
} }
#ifndef QT_BOOTSTRAPPED #if QT_CONFIG(regularexpression)
// http://www.freedesktop.org/wiki/Software/xdg-user-dirs // http://www.freedesktop.org/wiki/Software/xdg-user-dirs
QString xdgConfigHome = QFile::decodeName(qgetenv("XDG_CONFIG_HOME")); QString xdgConfigHome = QFile::decodeName(qgetenv("XDG_CONFIG_HOME"));
if (xdgConfigHome.isEmpty()) if (xdgConfigHome.isEmpty())
@ -232,7 +232,7 @@ QString QStandardPaths::writableLocation(StandardLocation type)
} }
} }
} }
#endif #endif // QT_CONFIG(regularexpression)
QString path; QString path;
switch (type) { switch (type) {