mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 06:00:30 -04:00
c2dd4d2e2d
The area51 repository features commits by Alonso Schaich, avilla, fluffy, jhale, makc and rakuco. Common changes: - Trim Makefile header - Convert to new option framework - Add/improve desktop entries - Remove upstreamed patches Mk/bsd.qt.mk: - Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1] devel/qmake: - Fix crash due to off-by one error [2] multimedia/qt4-phonon*: - Deprecate in favour of multimedia/phonon* www/qt4-webkit: - Make dependence on GStreamer optional [3] devel/qtcreator: - Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4] Reported by: avg via irc [1] Submitted by: avg via maillist [2] PR: ports/175644 [3] Submitted by: danfe [3] PR: ports/169809 [4] Reported by: tcb <tcberner at gmail.com> [4]
13 lines
727 B
C++
13 lines
727 B
C++
--- ./src/plugins/qt4projectmanager/makestep.cpp.orig 2012-09-10 07:29:16.000000000 -0700
|
|
+++ ./src/plugins/qt4projectmanager/makestep.cpp 2012-09-15 09:10:41.176369913 -0700
|
|
@@ -237,8 +237,10 @@
|
|
// but for now this is the least invasive change
|
|
// We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose
|
|
if (tc && m_makeCmd.isEmpty()) {
|
|
+#ifndef Q_OS_FREEBSD
|
|
if (tc->targetAbi().binaryFormat() != Abi::PEFormat )
|
|
Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
|
|
+#endif
|
|
if (tc->targetAbi().os() == Abi::WindowsOS
|
|
&& tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor) {
|
|
const QString makeFlags = QLatin1String("MAKEFLAGS");
|