Commit d229180b authored by J-P Nurmi's avatar J-P Nurmi Committed by The Qt Project
Browse files

Fix the remaining include directives to follow Qt conventions


In public header files, always use this form to include Qt
headers: #include <QtCore/qwhatever.h>. The library prefix
is very convenient for non-qmake projects.

Change-Id: I033ae9defee2ae7d383d8f268a4d7923162ac49e
Reviewed-by: default avatarJake Petroules <jake.petroules@petroules.com>
Reviewed-by: default avatarCaroline Chao <caroline.chao@digia.com>
Showing with 4 additions and 5 deletions
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#pragma qt_class(QWinFunctions) #pragma qt_class(QWinFunctions)
#endif #endif
#include <QObject> #include <QtCore/qobject.h>
#include <QtWinExtras/qwinextrasglobal.h>
#include <QtCore/qt_windows.h> #include <QtCore/qt_windows.h>
#include <QtWinExtras/qwinextrasglobal.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
...@@ -124,7 +124,7 @@ void Q_WINEXTRAS_EXPORT taskbarDeleteTab(QWindow *); ...@@ -124,7 +124,7 @@ void Q_WINEXTRAS_EXPORT taskbarDeleteTab(QWindow *);
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
#include <QWidget> #include <QtWidgets/qwidget.h>
namespace QWinExtras namespace QWinExtras
{ {
......
...@@ -42,9 +42,8 @@ ...@@ -42,9 +42,8 @@
#ifndef QWINTASKBARBUTTON_H #ifndef QWINTASKBARBUTTON_H
#define QWINTASKBARBUTTON_H #define QWINTASKBARBUTTON_H
#include <QtCore/qobject.h>
#include <QtWinExtras/qwinextrasglobal.h> #include <QtWinExtras/qwinextrasglobal.h>
#include <QObject>
#include <QList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment