From 07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@digia.com>
Date: Sat, 26 Jan 2013 21:42:12 +0100
Subject: Remove QT_{BEGIN,END}_HEADER macro usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The macro was made empty in ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Id2bb2e2cabde059305d4af5f12593344ba30f001
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/widgets/dialogs/qfiledialog.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/widgets/dialogs/qfiledialog.h')

diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 84bb0fa98c..6ddbb7c0d0 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -46,8 +46,6 @@
 #include <QtCore/qstring.h>
 #include <QtWidgets/qdialog.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -264,6 +262,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDialog::Options)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QFILEDIALOG_H
-- 
cgit v1.2.3


From ef9c3c753dd22e675b334e1b045f93401e1f9df3 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Sun, 17 Mar 2013 14:26:18 -0400
Subject: Fix license headers stating QtGui for QtWidgets files.

Change-Id: I0ca49e3e1f9f603f0b0f7f3553e854b871efe303
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/widgets/dialogs/qfiledialog.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/widgets/dialogs/qfiledialog.h')

diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 973bccf940..98d1fd5695 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the QtWidgets module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
-- 
cgit v1.2.3