[78096] trunk/dports/devel/qt4-creator-mac
mcalhoun at macports.org
mcalhoun at macports.org
Sat Apr 23 08:34:32 PDT 2011
Revision: 78096
http://trac.macports.org/changeset/78096
Author: mcalhoun at macports.org
Date: 2011-04-23 08:34:30 -0700 (Sat, 23 Apr 2011)
Log Message:
-----------
qt4-creator-mac: Allow Creator to find standard system header files; See http://bugreports.qt.nokia.com/browse/QTCREATORBUG-4370
Modified Paths:
--------------
trunk/dports/devel/qt4-creator-mac/Portfile
Added Paths:
-----------
trunk/dports/devel/qt4-creator-mac/files/patch-environment.cpp.diff
Modified: trunk/dports/devel/qt4-creator-mac/Portfile
===================================================================
--- trunk/dports/devel/qt4-creator-mac/Portfile 2011-04-23 14:18:31 UTC (rev 78095)
+++ trunk/dports/devel/qt4-creator-mac/Portfile 2011-04-23 15:34:30 UTC (rev 78096)
@@ -6,7 +6,7 @@
name qt4-creator-mac
version 2.1.0
-revision 0
+revision 1
categories devel aqua
platforms darwin
maintainers mcalhoun openmaintainer
@@ -27,6 +27,12 @@
# specify that here instead.
patchfiles patch-remove_build_types.diff
+# If QT specifies just the name of the compiler, Creator can find it.
+# qt4-mac, however, specifiles the full path of g++ in the form "QMAKE_CXX= /usr/bin/g++-*.*"
+# Creator thinks there is a space before the program name and can't find it.
+# See http://bugreports.qt.nokia.com/browse/QTCREATORBUG-4370
+patchfiles-append patch-environment.cpp.diff
+
post-patch {
# remove arch from QMake build scripts
reinplace "/ppc/d" ${worksrcpath}/qtcreator.pri
Added: trunk/dports/devel/qt4-creator-mac/files/patch-environment.cpp.diff
===================================================================
--- trunk/dports/devel/qt4-creator-mac/files/patch-environment.cpp.diff (rev 0)
+++ trunk/dports/devel/qt4-creator-mac/files/patch-environment.cpp.diff 2011-04-23 15:34:30 UTC (rev 78096)
@@ -0,0 +1,11 @@
+--- src/libs/utils/environment.cpp.orig 2011-02-11 11:29:12.000000000 -0700
++++ src/libs/utils/environment.cpp 2011-04-23 07:51:20.000000000 -0700
+@@ -188,7 +188,7 @@
+ QString Environment::searchInPath(const QString &executable,
+ const QStringList & additionalDirs) const
+ {
+- QString exec = expandVariables(executable);
++ QString exec = expandVariables(executable.trimmed());
+
+ if (exec.isEmpty() || QFileInfo(exec).isAbsolute())
+ return QDir::toNativeSeparators(exec);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110423/2eff7007/attachment.html>
More information about the macports-changes
mailing list