whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some build fixes

bb10
Lars Knoll 2011-05-07 21:24:37 +02:00
parent 7ff96330ed
commit aa566e7297
10 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/qt_opengl.pri
View File

@ -11,6 +11,6 @@ QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
QT.opengl.libs = $$QT_MODULE_LIB_BASE
QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE
QT.opengl.imports = $$QT_MODULE_IMPORT_BASE
QT.opengl.depends = core gui
QT.opengl.depends = core gui widgets
QT.opengl.CONFIG = opengl
QT.opengl.DEFINES = QT_OPENGL_LIB

4
src/modules/qt_widgets.pri
View File

@ -3,12 +3,12 @@ QT.widgets.MAJOR_VERSION = 4
QT.widgets.MINOR_VERSION = 8
QT.widgets.PATCH_VERSION = 0
QT.widgets.name = QtGui
QT.widgets.name = QtWidgets
QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets
QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION
QT.widgets.sources = $$QT_MODULE_BASE/src/widgets
QT.widgets.libs = $$QT_MODULE_LIB_BASE
QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE
QT.widgets.imports = $$QT_MODULE_IMPORT_BASE
QT.widgets.depends = core network
QT.widgets.depends = core network gui
QT.widgets.DEFINES = QT_GUI_LIB

2
src/opengl/opengl.pro
View File

@ -1,6 +1,6 @@
TARGET = QtOpenGL
QPRO_PWD = $$PWD
QT = core-private gui-private
QT = core-private gui-private widgets-private
CONFIG += module
MODULE_PRI = ../modules/qt_opengl.pri

2
src/opengl/qgl.h
View File

@ -42,7 +42,7 @@
#ifndef QGL_H
#define QGL_H
#include <QtGui/qwidget.h>
#include <QtWidgets/qwidget.h>
#include <QtGui/qpaintengine.h>
#include <QtOpenGL/qglcolormap.h>
#include <QtCore/qmap.h>

4
src/opengl/qgraphicsshadereffect.cpp
View File

@ -46,8 +46,8 @@
#define QGL_HAVE_CUSTOM_SHADERS 1
#endif
#include <QtGui/qpainter.h>
#include <QtGui/qgraphicsitem.h>
#include <QtGui/private/qgraphicseffect_p.h>
#include <QtWidgets/qgraphicsitem.h>
#include <private/qgraphicseffect_p.h>
QT_BEGIN_NAMESPACE

3
sync.profile
View File

@ -70,6 +70,7 @@
"QtOpenGL" => {
"QtCore" => "THIS_REPOSITORY",
"QtGui" => "THIS_REPOSITORY",
"QtWidgets" => "THIS_REPOSITORY",
},
"QtXml" => {
"QtCore" => "THIS_REPOSITORY",
@ -89,10 +90,10 @@
},
"QtGui" => {
"QtCore" => "THIS_REPOSITORY",
"QtGui" => "THIS_REPOSITORY",
},
"QtWidgets" => {
"QtCore" => "THIS_REPOSITORY",
"QtGui" => "THIS_REPOSITORY",
},
"QtUiTools" => {
"QtCore" => "THIS_REPOSITORY",

38
tools/uilib/abstractformbuilder.cpp
View File

@ -55,48 +55,14 @@
#include <QtCore/qdebug.h>
#include <QtCore/QCoreApplication>
#include <QtGui/QAction>
#include <QtGui/QActionGroup>
#include <QtGui/QButtonGroup>
#include <QtGui/QComboBox>
#include <QtGui/QFontComboBox>
#include <QtGui/QGridLayout>
#ifndef QT_NO_FORMLAYOUT
# include <QtGui/QFormLayout>
#endif
#include <QtGui/QIcon>
#include <QtGui/QListWidget>
#include <QtGui/QMainWindow>
#include <QtGui/QPixmap>
#include <QtGui/QStatusBar>
#include <QtGui/QTreeWidget>
#include <QtGui/QTableWidget>
#include <QtGui/QWidget>
#include <QtGui/QSplitter>
#include <QtGui/QScrollArea>
#include <QtGui/QAbstractButton>
#include <QtGui/QAbstractItemView>
#include <QtGui/QHeaderView>
#include <QtGui/QtGui>
#include <QtWidgets/QtWidgets>
#ifndef QFORMINTERNAL_NAMESPACE
# include <private/qlayout_p.h> // Compiling within Designer
#endif
#include <QtXml/QXmlStreamReader>
#include <QtGui/QDialog>
// containers
#include <QtGui/QToolBox>
#include <QtGui/QStackedWidget>
#include <QtGui/QTabWidget>
#include <QtGui/QToolBar>
#include <QtGui/QMenuBar>
#include <QtGui/QDockWidget>
#include <QtGui/QMdiArea>
#include <QtGui/QWorkspace>
#include <QtGui/QWizard>
#include <QtGui/QWizardPage>
#include <QtCore/qdebug.h>
#include <limits.h>

2
tools/uilib/abstractformbuilder.h
View File

@ -48,7 +48,7 @@
#include <QtCore/QHash>
#include <QtCore/QDir>
#include <QtGui/QSizePolicy>
#include <QtWidgets/QSizePolicy>
#include <QtGui/QPalette>
QT_BEGIN_HEADER

2
tools/uilib/customwidget.h
View File

@ -45,7 +45,7 @@
#include "extension.h"
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtGui/QIcon>
#include <QtWidgets/QIcon>
QT_BEGIN_HEADER

2
tools/uilib/properties_p.h
View File

@ -60,7 +60,7 @@
#include <QtCore/QLocale>
#include <QtCore/QCoreApplication>
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "formbuilderextra_p.h"