d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

package qt: use accepted upstream patch

This commit is contained in:
Mark Brand 2014-05-04 22:04:03 +02:00
parent cc00a4b039
commit 22d382743f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt-1-cherrypicks.patch
View File

@ -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