From a4c0d518bfd052ec48f2d49aec46e21ad459c66a Mon Sep 17 00:00:00 2001 From: Luca Quartesan Date: Thu, 6 Jan 2022 18:57:38 +0100 Subject: [PATCH] Revert "added support to qt5" This reverts commit 9d07003e37a68cc05920f917bec01762ff3f0cef. --- build/config-linux-gcc.py | 2 +- data/scons/qt5.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/config-linux-gcc.py b/build/config-linux-gcc.py index 47eb3790..8443a4a7 100644 --- a/build/config-linux-gcc.py +++ b/build/config-linux-gcc.py @@ -4,7 +4,7 @@ BUILDDIR = '#build/release' DISTDIR = '#dist' CXX = 'g++' CC = 'gcc' -CXXFLAGS = ['-O3', '-Wall', '-fPIC', '-std=c++11', '-g', '-pipe', '-march=nocona', '-msse2', '-ftree-vectorize', '-mfpmath=sse', '-funsafe-math-optimizations', '-fno-rounding-math', '-fno-signaling-nans', '-fno-math-errno', '-fomit-frame-pointer', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fopenmp', '-fvisibility=hidden', '-mtls-dialect=gnu2'] +CXXFLAGS = ['-O3', '-Wall', '-g', '-pipe', '-march=nocona', '-msse2', '-ftree-vectorize', '-mfpmath=sse', '-funsafe-math-optimizations', '-fno-rounding-math', '-fno-signaling-nans', '-fno-math-errno', '-fomit-frame-pointer', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fopenmp', '-fvisibility=hidden', '-mtls-dialect=gnu2'] LINKFLAGS = [] SHLINKFLAGS = ['-rdynamic', '-shared', '-fPIC', '-lstdc++'] BASEINCLUDE = ['#include'] diff --git a/data/scons/qt5.py b/data/scons/qt5.py index 7a5920fe..4bddb898 100644 --- a/data/scons/qt5.py +++ b/data/scons/qt5.py @@ -438,7 +438,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) : self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5")]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5",module)]) - pcmodules = [module.replace('Qt','Qt5')+debugSuffix for module in modules if module not in pclessModules ] + pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ] if 'QtDBus' in pcmodules: self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5","QtDBus")]) if "QtAssistant" in pcmodules: