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

QTDIR/src compiles again

Browse Source
This commit is contained in:
Lars Knoll 2011-05-07 22:25:30 +02:00
parent 3d30c0fb60
commit 9474f82f8a
13 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/eglfs/qeglfswindow.h
View File

@ -46,7 +46,7 @@
#include "qeglfsscreen.h" #include "qeglfsscreen.h"
#include <QPlatformWindow> #include <QPlatformWindow>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp
View File

@ -41,7 +41,7 @@
#include "qbasicunixfontdatabase.h" #include "qbasicunixfontdatabase.h"
#include <QtGui/private/qapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
#include <QtGui/QPlatformScreen> #include <QtGui/QPlatformScreen>
#include <QtCore/QFile> #include <QtCore/QFile>

4
src/plugins/platforms/minimal/qminimalwindowsurface.cpp
View File

@ -42,7 +42,7 @@
#include "qminimalwindowsurface.h" #include "qminimalwindowsurface.h"
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/private/qapplication_p.h> #include <private/qguiapplication_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -78,7 +78,7 @@ void QMinimalWindowSurface::resize(const QSize &size)
{ {
//qDebug() << "QMinimalWindowSurface::setGeometry:" << (long)this << rect; //qDebug() << "QMinimalWindowSurface::setGeometry:" << (long)this << rect;
QWindowSurface::resize(size); QWindowSurface::resize(size);
QImage::Format format = QApplicationPrivate::platformIntegration()->screens().first()->format(); QImage::Format format = QGuiApplicationPrivate::platformIntegration()->screens().first()->format();
if (mImage.size() != size) if (mImage.size() != size)
mImage = QImage(size, format); mImage = QImage(size, format);
} }

2
src/plugins/platforms/openkode/qopenkodewindow.cpp
View File

@ -53,7 +53,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include <QtGui/private/qwidget_p.h> #include <QtGui/private/qwidget_p.h>
#include <QtGui/private/qapplication_p.h> #include <QtGui/private/qapplication_p.h>

2
src/plugins/platforms/vnc/qvncserver.cpp
View File

@ -43,7 +43,7 @@
#include <QtCore/qtimer.h> #include <QtCore/qtimer.h>
#include <QtCore/qregexp.h> #include <QtCore/qregexp.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include <QtGui/qpolygon.h> #include <QtGui/qpolygon.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>

2
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -51,7 +51,7 @@
#endif #endif
#include <QtCore/QAbstractEventDispatcher> #include <QtCore/QAbstractEventDispatcher>
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>

2
src/plugins/platforms/xcb/qdri2context.cpp
View File

@ -45,7 +45,7 @@
#include "qxcbconnection.h" #include "qxcbconnection.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <xcb/dri2.h> #include <xcb/dri2.h>
#include <xcb/xfixes.h> #include <xcb/xfixes.h>

24
src/uitools/quiloader.cpp
View File

@ -50,21 +50,21 @@
#include <ui4_p.h> #include <ui4_p.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/QAction> #include <QtWidgets/QAction>
#include <QtGui/QActionGroup> #include <QtWidgets/QActionGroup>
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QLibraryInfo> #include <QtCore/QLibraryInfo>
#include <QtGui/QLayout> #include <QtWidgets/QLayout>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtGui/QTabWidget> #include <QtWidgets/QTabWidget>
#include <QtGui/QTreeWidget> #include <QtWidgets/QTreeWidget>
#include <QtGui/QListWidget> #include <QtWidgets/QListWidget>
#include <QtGui/QTableWidget> #include <QtWidgets/QTableWidget>
#include <QtGui/QToolBox> #include <QtWidgets/QToolBox>
#include <QtGui/QComboBox> #include <QtWidgets/QComboBox>
#include <QtGui/QFontComboBox> #include <QtWidgets/QFontComboBox>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
tools/uilib/formbuilder.cpp
View File

@ -45,6 +45,7 @@
#include "ui4_p.h" #include "ui4_p.h"
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

6
tools/uilib/formbuilderextra.cpp
View File

@ -45,9 +45,9 @@
#include "textbuilder_p.h" #include "textbuilder_p.h"
#include "ui4_p.h" #include "ui4_p.h"
#include <QtGui/QLabel> #include <QtWidgets/QLabel>
#include <QtGui/QBoxLayout> #include <QtWidgets/QBoxLayout>
#include <QtGui/QGridLayout> #include <QtWidgets/QGridLayout>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>

2
tools/uilib/formscriptrunner.cpp
View File

@ -44,7 +44,7 @@
#include "ui4_p.h" #include "ui4_p.h"
#include <QtScript/QScriptEngine> #include <QtScript/QScriptEngine>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>

6
tools/uilib/properties.cpp
View File

@ -49,11 +49,11 @@
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtGui/QFrame> #include <QtWidgets/QFrame>
#include <QtGui/QAbstractScrollArea> #include <QtWidgets/QAbstractScrollArea>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
tools/uilib/resourcebuilder.cpp
View File

@ -46,7 +46,7 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE