diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 2 | ||||
| -rw-r--r-- | src/scripttools/scripttools.pro | 3 | ||||
| -rw-r--r-- | src/src.pro | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index bf3cb53..bea5896 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -77,7 +77,7 @@ inline double wtf_ceil(double x) { return copysign(ceil(x), x); } #endif -#if OS(SOLARIS) +#if OS(SOLARIS) && __cplusplus < 201103L namespace std { diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index fb4343a..542af43 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -1,6 +1,3 @@ -load(qfeatures) -requires(!contains(QT_DISABLED_FEATURES, textedit)) - TARGET = QtScriptTools QT = core-private QT_PRIVATE = gui widgets-private script diff --git a/src/src.pro b/src/src.pro index e81b193..eb22a14 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,7 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += script -qtHaveModule(widgets): SUBDIRS += scripttools +qtHaveModule(widgets): { + QT_FOR_CONFIG += widgets + qtConfig(textedit): SUBDIRS += scripttools +} |