[138653] trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff

[michaelld at macports.org]

Revision: 138653
          https://trac.macports.org/changeset/138653
Author:   michaelld at macports.org
Date:     2015-07-14 11:11:56 -0700 (Tue, 14 Jul 2015)
Log Message:
-----------
qt4-mac: fix cxx11 patch for 4.8.7.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff

Modified: trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff	2015-07-14 17:55:50 UTC (rev 138652)
+++ trunk/dports/aqua/qt4-mac/files/patch-cxx11.diff	2015-07-14 18:11:56 UTC (rev 138653)
@@ -234,7 +234,7 @@
  class QAInterface;
 --- src/gui/styles/qmacstyle_mac.mm.orig	2013-01-22 19:50:08.000000000 -0500
 +++ src/gui/styles/qmacstyle_mac.mm	2013-01-22 19:55:50.000000000 -0500
-@@ -3468,8 +3468,8 @@
+@@ -3466,8 +3466,8 @@
                      tti.version = qt_mac_hitheme_version;
                      tti.state = tds;
                      QColor textColor = btn->palette.buttonText().color();
@@ -245,7 +245,7 @@
                      CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
                      CGContextSetFillColor(cg, colorComp);
                      tti.fontID = themeId;
-@@ -3701,8 +3701,8 @@
+@@ -3708,8 +3708,8 @@
                  tti.version = qt_mac_hitheme_version;
                  tti.state = tds;
                  QColor textColor = myTab.palette.windowText().color();
@@ -256,7 +256,7 @@
                  CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
                  CGContextSetFillColor(cg, colorComp);
                  switch (d->aquaSizeConstrain(opt, w)) {
-@@ -3882,8 +3882,8 @@
+@@ -3898,8 +3898,8 @@
                  CGContextSetShouldAntialias(cg, true);
                  CGContextSetShouldSmoothFonts(cg, true);
                  QColor textColor = p->pen().color();
@@ -267,7 +267,7 @@
                  CGContextSetFillColorSpace(cg, QCoreGraphicsPaintEngine::macGenericColorSpace());
                  CGContextSetFillColor(cg, colorComp);
                  HIThemeTextInfo tti;
-@@ -5018,8 +5018,8 @@
+@@ -5034,8 +5034,8 @@
                  tti.version = qt_mac_hitheme_version;
                  tti.state = tds;
                  QColor textColor = groupBox->palette.windowText().color();
@@ -592,25 +592,3 @@
      return true;
  }
  
---- tools/designer/src/lib/shared/previewmanager.cpp.orig	2014-05-01 12:33:00.000000000 -0400
-+++ tools/designer/src/lib/shared/previewmanager.cpp	2014-05-01 12:33:16.000000000 -0400
-@@ -817,7 +817,7 @@
- {
-     typedef PreviewManagerPrivate::PreviewDataList PreviewDataList;
-     if (d->m_previews.empty())
--        return false;
-+        return 0;
- 
-     // find matching window
-     const PreviewDataList::const_iterator cend =  d->m_previews.constEnd();
---- src/scripttools/debugging/qscriptdebuggerconsole.cpp.orig	2014-05-01 13:47:57.000000000 -0400
-+++ src/scripttools/debugging/qscriptdebuggerconsole.cpp	2014-05-01 13:48:11.000000000 -0400
-@@ -489,7 +489,7 @@
-     d->input += QLatin1Char('\n');
-     QScriptSyntaxCheckResult check = QScriptEngine::checkSyntax(d->input);
-     if (check.state() == QScriptSyntaxCheckResult::Intermediate)
--        return false;
-+        return 0;
-     d->input.chop(1); // remove the last \n
-     cmd = QString();
-     cmd.append(d->commandPrefix);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150714/73997747/attachment.html>