1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix remaining includes

Browse Source 
Made easy thanks to the fixqt4includes
script
This commit is contained in:
Lars Knoll 2011-05-07 22:20:17 +02:00
parent b597565788
commit 3d30c0fb60
16 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opengl/gl2paintengineex/qtriangulator.cpp
View File

@ -41,7 +41,7 @@
#include "qtriangulator_p.h" #include "qtriangulator_p.h"
#include <QtGui/qdialog.h> #include <QtWidgets/qdialog.h>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
#include <QtGui/qpainterpath.h> #include <QtGui/qpainterpath.h>

4
src/opengl/qgl_qpa.cpp
View File

@ -40,11 +40,11 @@
****************************************************************************/ ****************************************************************************/
#include <QApplication> #include <QApplication>
#include <QtGui/private/qapplication_p.h> #include <private/qapplication_p.h>
#include <QPixmap> #include <QPixmap>
#include <QDebug> #include <QDebug>
#include <QtGui/private/qapplication_p.h> #include <private/qapplication_p.h>
#include <QtGui/QPlatformGLContext> #include <QtGui/QPlatformGLContext>
#include <QtGui/QPlatformWindow> #include <QtGui/QPlatformWindow>
#include <QtGui/QWindowContext> #include <QtGui/QWindowContext>

2
src/opengl/qgraphicsshadereffect_p.h
View File

@ -53,7 +53,7 @@
// We mean it. // We mean it.
// //
#include <QtGui/qgraphicseffect.h> #include <QtWidgets/qgraphicseffect.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/opengl/qwindowsurface_gl.cpp
View File

@ -39,11 +39,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QColormap> #include <QtGui/QColormap>
#include <QtGui/QDesktopWidget> #include <QtWidgets/QDesktopWidget>
#include <QtGui/QPaintDevice> #include <QtGui/QPaintDevice>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <qglframebufferobject.h> #include <qglframebufferobject.h>
#include <qglpixelbuffer.h> #include <qglpixelbuffer.h>

2
src/widgets/dialogs/qwizard_win.cpp
View File

@ -48,7 +48,7 @@
#include "qpaintengine.h" #include "qpaintengine.h"
#include "qapplication.h" #include "qapplication.h"
#include <QtGui/QMouseEvent> #include <QtGui/QMouseEvent>
#include <QtGui/QDesktopWidget> #include <QtWidgets/QDesktopWidget>
// Note, these tests are duplicates in qwindowsxpstyle_p.h. // Note, these tests are duplicates in qwindowsxpstyle_p.h.
#ifdef Q_CC_GNU #ifdef Q_CC_GNU

2
src/widgets/platforms/x11/qkde_p.h
View File

@ -44,7 +44,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtGui/QPalette> #include <QtGui/QPalette>
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
// //
// W A R N I N G // W A R N I N G

2
src/widgets/platforms/x11/qx11embed_x11.h
View File

@ -42,7 +42,7 @@
#ifndef QX11EMBED_X11_H #ifndef QX11EMBED_X11_H
#define QX11EMBED_X11_H #define QX11EMBED_X11_H
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/widgets/styles/qgtkpainter.cpp
View File

@ -48,8 +48,8 @@
// and takes care of converting all such calls into cached Qt pixmaps. // and takes care of converting all such calls into cached Qt pixmaps.
#include <private/qstylehelper_p.h> #include <private/qstylehelper_p.h>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <QtGui/QStyleOption> #include <QtWidgets/QStyleOption>
#include <QtGui/QPixmapCache> #include <QtGui/QPixmapCache>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/widgets/styles/qgtkpainter_p.h
View File

@ -56,7 +56,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if !defined(QT_NO_STYLE_GTK) #if !defined(QT_NO_STYLE_GTK)
#include <QtGui/QCleanlooksStyle> #include <QtWidgets/QCleanlooksStyle>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QPalette> #include <QtGui/QPalette>
#include <QtGui/QFont> #include <QtGui/QFont>

44
src/widgets/styles/qgtkstyle.cpp
View File

@ -45,29 +45,29 @@
#include <private/qapplication_p.h> #include <private/qapplication_p.h>
#include <QtCore/QLibrary> #include <QtCore/QLibrary>
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtGui/QDialogButtonBox> #include <QtWidgets/QDialogButtonBox>
#include <QtGui/QStatusBar> #include <QtWidgets/QStatusBar>
#include <QtGui/QLineEdit> #include <QtWidgets/QLineEdit>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <QtGui/QListView> #include <QtWidgets/QListView>
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QStyleOption> #include <QtWidgets/QStyleOption>
#include <QtGui/QPushButton> #include <QtWidgets/QPushButton>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QMainWindow> #include <QtWidgets/QMainWindow>
#include <QtGui/QToolBar> #include <QtWidgets/QToolBar>
#include <QtGui/QHeaderView> #include <QtWidgets/QHeaderView>
#include <QtGui/QMenuBar> #include <QtWidgets/QMenuBar>
#include <QtGui/QComboBox> #include <QtWidgets/QComboBox>
#include <QtGui/QSpinBox> #include <QtWidgets/QSpinBox>
#include <QtGui/QScrollBar> #include <QtWidgets/QScrollBar>
#include <QtGui/QAbstractButton> #include <QtWidgets/QAbstractButton>
#include <QtGui/QToolButton> #include <QtWidgets/QToolButton>
#include <QtGui/QGroupBox> #include <QtWidgets/QGroupBox>
#include <QtGui/QRadioButton> #include <QtWidgets/QRadioButton>
#include <QtGui/QCheckBox> #include <QtWidgets/QCheckBox>
#include <QtGui/QTreeView> #include <QtWidgets/QTreeView>
#include <QtGui/QStyledItemDelegate> #include <QtWidgets/QStyledItemDelegate>
#include <qpixmapcache.h> #include <qpixmapcache.h>
#undef signals // Collides with GTK stymbols #undef signals // Collides with GTK stymbols
#include <private/qgtkpainter_p.h> #include <private/qgtkpainter_p.h>

4
src/widgets/styles/qgtkstyle.h
View File

@ -42,10 +42,10 @@
#ifndef QGTKSTYLE_H #ifndef QGTKSTYLE_H
#define QGTKSTYLE_H #define QGTKSTYLE_H
#include <QtGui/QCleanlooksStyle> #include <QtWidgets/QCleanlooksStyle>
#include <QtGui/QPalette> #include <QtGui/QPalette>
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtGui/QFileDialog> #include <QtWidgets/QFileDialog>
QT_BEGIN_HEADER QT_BEGIN_HEADER

16
src/widgets/styles/qgtkstyle_p.cpp
View File

@ -65,15 +65,15 @@
#include <private/qapplication_p.h> #include <private/qapplication_p.h>
#include <private/qiconloader_p.h> #include <private/qiconloader_p.h>
#include <QtGui/QMenu> #include <QtWidgets/QMenu>
#include <QtGui/QStyle> #include <QtWidgets/QStyle>
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QPixmapCache> #include <QtGui/QPixmapCache>
#include <QtGui/QStatusBar> #include <QtWidgets/QStatusBar>
#include <QtGui/QMenuBar> #include <QtWidgets/QMenuBar>
#include <QtGui/QToolBar> #include <QtWidgets/QToolBar>
#include <QtGui/QToolButton> #include <QtWidgets/QToolButton>
#include <QtGui/QX11Info> #include <QtWidgets/QX11Info>
#include <private/qt_x11_p.h> #include <private/qt_x11_p.h>

4
src/widgets/styles/qgtkstyle_p.h
View File

@ -60,9 +60,9 @@
#include <QtCore/qstringbuilder.h> #include <QtCore/qstringbuilder.h>
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtGui/QFileDialog> #include <QtWidgets/QFileDialog>
#include <QtGui/QGtkStyle> #include <QtWidgets/QGtkStyle>
#include <private/qcleanlooksstyle_p.h> #include <private/qcleanlooksstyle_p.h>
#undef signals // Collides with GTK stymbols #undef signals // Collides with GTK stymbols

2
src/widgets/widgets.pro
View File

@ -3,7 +3,7 @@ QPRO_PWD = $$PWD
QT = core-private gui-private QT = core-private gui-private
CONFIG += module CONFIG += module
MODULE_PRI = ../modules/qt_gui.pri MODULE_PRI = ../modules/qt_widgets.pri
DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000

2
src/widgets/widgets/qmaccocoaviewcontainer_mac.h
View File

@ -42,7 +42,7 @@
#ifndef QCOCOAVIEWCONTAINER_H #ifndef QCOCOAVIEWCONTAINER_H
#define QCOCOAVIEWCONTAINER_H #define QCOCOAVIEWCONTAINER_H
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/widgets/widgets/qmacnativewidget_mac.h
View File

@ -42,7 +42,7 @@
#ifndef QMACNATIVEWIDGET_H #ifndef QMACNATIVEWIDGET_H
#define QMACNATIVEWIDGET_H #define QMACNATIVEWIDGET_H
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_HEADER QT_BEGIN_HEADER