diff options
| -rw-r--r-- | devel/qmake/files/Makefile.bsd | 2 | ||||
| -rw-r--r-- | devel/qmake/files/patch-generators_c++17 | 62 |
2 files changed, 63 insertions, 1 deletions
diff --git a/devel/qmake/files/Makefile.bsd b/devel/qmake/files/Makefile.bsd index 1ad3224c94e5..5ac9d8ae784f 100644 --- a/devel/qmake/files/Makefile.bsd +++ b/devel/qmake/files/Makefile.bsd @@ -19,7 +19,7 @@ CXXFLAGS+=-I${.CURDIR:H}/src/$s CXXFLAGS+=-I${.CURDIR}/generators$g .endfor -CXXFLAGS+=-I. -I"${FILESDIR}" +CXXFLAGS+=-I. -I"${FILESDIR}" -Dregister= CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \ -DQT_NO_STL -DQT_NO_COMPRESS -DQT_INSTALL_DATA="\"${SHAREDIR}\"" diff --git a/devel/qmake/files/patch-generators_c++17 b/devel/qmake/files/patch-generators_c++17 new file mode 100644 index 000000000000..5499fbce65a6 --- /dev/null +++ b/devel/qmake/files/patch-generators_c++17 @@ -0,0 +1,62 @@ +Insert the spaces between literals to satisfy clang with c++17 (or +even c++11) standard. + + -mi + +--- generators/win32/borland_bmake.cpp 2007-02-02 14:01:28 UTC ++++ generators/win32/borland_bmake.cpp +@@ -383,7 +383,7 @@ BorlandMakefileGenerator::init() + if(project->isEmpty("QMAKE_INSTALL_DIR")) + project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); + +- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX); ++ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qtmt" QTDLL_POSTFIX); + QStringList &configs = project->variables()["CONFIG"]; + if (project->isActiveConfig("shared")) + project->variables()["DEFINES"].append("QT_DLL"); +--- generators/win32/mingw_make.cpp 2007-02-02 14:01:28 UTC ++++ generators/win32/mingw_make.cpp +@@ -394,7 +394,7 @@ MingwMakefileGenerator::init() + if(project->isEmpty("QMAKE_INSTALL_DIR")) + project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); + +- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); ++ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); + project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; + + // LIBS defined in Profile comes first for gcc +--- generators/win32/msvc_dsp.cpp 2007-02-02 14:01:27 UTC ++++ generators/win32/msvc_dsp.cpp +@@ -620,7 +620,7 @@ DspMakefileGenerator::init() + if ( project->variables()["QMAKESPEC"].isEmpty() ) + project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); + +- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); ++ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); + project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; + + QStringList &configs = project->variables()["CONFIG"]; +--- generators/win32/msvc_nmake.cpp 2007-02-02 14:01:28 UTC ++++ generators/win32/msvc_nmake.cpp +@@ -479,7 +479,7 @@ NmakeMakefileGenerator::init() + if(project->isEmpty("QMAKE_INSTALL_DIR")) + project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); + +- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); ++ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); + project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; + + QString targetfilename = project->variables()["TARGET"].first(); +--- generators/win32/msvc_vcproj.cpp 2007-02-02 14:01:28 UTC ++++ generators/win32/msvc_vcproj.cpp +@@ -1094,8 +1094,8 @@ void VcprojGenerator::initOld() + project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); + + bool is_qt = +- ( project->first("TARGET") == "qt"QTDLL_POSTFIX || +- project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); ++ ( project->first("TARGET") == "qt" QTDLL_POSTFIX || ++ project->first("TARGET") == "qt-mt" QTDLL_POSTFIX ); + + QStringList &configs = project->variables()["CONFIG"]; + |