From dac3c7f74f916a352f970841646faaae50e82f50 Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Tue, 23 Mar 2010 17:09:07 +0000 Subject: - Update to 1.3.1 Approved by: miwi (mentor) --- .../patch-src-plugins-qt4projectmanager-makestep.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp') diff --git a/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp b/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp index 8b52fccd8ade..41e60601b3aa 100644 --- a/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp +++ b/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp @@ -1,13 +1,13 @@ ---- src/plugins/qt4projectmanager/makestep.cpp.orig 2009-07-10 15:38:08.000000000 +0300 -+++ src/plugins/qt4projectmanager/makestep.cpp 2009-08-15 16:59:49.000000000 +0300 -@@ -101,8 +101,10 @@ - // but for now this is the least invasive change - ProjectExplorer::ToolChain::ToolChainType t = qobject_cast(project())->qtVersion(name)->toolchainType(); - if (t != ProjectExplorer::ToolChain::MSVC && t != ProjectExplorer::ToolChain::WINCE) { -+#ifndef Q_OS_FREEBSD +--- src/plugins/qt4projectmanager/makestep.cpp.orig 2010-01-15 12:36:53.000000000 -0500 ++++ src/plugins/qt4projectmanager/makestep.cpp 2010-03-22 11:12:02.280703600 -0400 +@@ -106,8 +106,10 @@ + if (toolchain) + type = toolchain->type(); + if (type != ProjectExplorer::ToolChain::MSVC && type != ProjectExplorer::ToolChain::WINCE) { ++#ifndef Q_OS_FREEBSD if (value(name, "makeCmd").toString().isEmpty()) args << "-w"; -+#endif ++#endif } - setEnabled(name, !skipMakeClean); + setEnabled(name, true); -- cgit v1.2.3