diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-05-04 20:04:03 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-05-04 20:04:03 (GMT) |
| commit | 22d382743f3e7574a5cfa5e86dd866f767c81f18 (patch) | |
| tree | e5aa0ec5ec47352d876e39e3a0a40e87f9f59607 /src/qt-1-cherrypicks.patch | |
| parent | cc00a4b0395144690874d66e8580f7579b026106 (diff) | |
| download | mxe-22d382743f3e7574a5cfa5e86dd866f767c81f18.zip mxe-22d382743f3e7574a5cfa5e86dd866f767c81f18.tar.gz mxe-22d382743f3e7574a5cfa5e86dd866f767c81f18.tar.bz2 | |
package qt: use accepted upstream patch
Diffstat (limited to 'src/qt-1-cherrypicks.patch')
| -rw-r--r-- | src/qt-1-cherrypicks.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index e722364..b0c8df2 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -80623,17 +80623,17 @@ index f58df8a..0c25ed4 100644 1.8.4.5 -From 49a52d3fce7c57d35020aa5dee2dedcf8625604d Mon Sep 17 00:00:00 2001 +From 31d8a5c526bdde7a1026380c269ba99baf2d38b1 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 30 Apr 2014 23:17:58 +0200 Subject: [PATCH 16/16] fix include of private header -taken from https://codereview.qt-project.org/84392 - Change-Id: I0554933de2536231d7d416d8df5b96eaa459fc51 +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> +(cherry picked from commit b7a67ca944ae5f16a03b2992e9f6989e5e831edc) diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp -index e933112..db13661 100644 +index e933112..3868c21 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -58,7 +58,7 @@ @@ -80641,7 +80641,7 @@ index e933112..db13661 100644 #include <qapplication.h> #include <qstylepainter.h> -#include <itemviews/qfileiconprovider_p.h> -+#include "private/qfileiconprovider_p.h" ++#include <private/qfileiconprovider_p.h> #if !defined(Q_WS_WINCE) && !defined(Q_OS_SYMBIAN) #include "ui_qfiledialog.h" #else |