Changeset 79747

Timestamp:

06/24/11 13:34:36 (4 years ago)

Author:

eborisch@…

Message:

qt4-creator-mac: Upgrade to 2.2.1. Closes #29824

Location:

trunk/dports/devel/qt4-creator-mac

Files:

• Portfile (modified) (2 diffs)
• files/patch-environment.cpp.diff (modified) (1 diff)

trunk/dports/devel/qt4-creator-mac/Portfile

@@ -6 +6 @@
 
 name                qt4-creator-mac
-version             2.1.0
-revision            1
+version             2.2.1
 categories          devel aqua
 platforms           darwin
@@ -20 +19 @@
 use_zip yes
 
-checksums           md5     a6e48b4347314fb2a92b77f40b4fc9a5 \
-                    sha1    f1d7abf92df7a9ba53eb9006ca189ac7203c0e9f \
-                    rmd160  16fdf6f03ab8ea6a567f4cd1cb58580772a9627b
+checksums           md5     8a3165f7f68d4932c9a902452993099d \
+                    sha1    6a369dffa7ee52ae068d9ebb3616e29d185a5009 \
+                    rmd160  dc4b6d6306c770b0bcab3dbaf08cab19bc7c0100
 
 # fix up QMake build files to remove debug and release building;

trunk/dports/devel/qt4-creator-mac/files/patch-environment.cpp.diff

@@ -1 @@
---- 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
+--- src/libs/utils/environment.cpp.orig 2011-06-24 14:31:54.000000000 -0500
++++ src/libs/utils/environment.cpp      2011-06-24 14:32:05.000000000 -0500
+@@ -204,7 +204,7 @@
+                                   const QStringList &additionalDirs) const
  {
--    QString exec = expandVariables(executable);
-+    QString exec = expandVariables(executable.trimmed());
+     foreach (const QString &executable, executables) {
+-        QString exec = expandVariables(executable);
++        QString exec = expandVariables(executable.trimmed());
  
-     if (exec.isEmpty() || QFileInfo(exec).isAbsolute())
-         return QDir::toNativeSeparators(exec);
+         if (exec.isEmpty())
+             continue;