[GB.QT5]
* BUG: Fix build with Qt 5.13. [GB.QT5.EXT] * BUG: Fix build with Qt 5.13. [GB.QT5.OPENGL] * BUG: Fix build with Qt 5.13. [GB.QT5.WEBKIT] * BUG: Fix build with Qt 5.13.
This commit is contained in:
parent
e09f6a6fa9
commit
53a8b5bde8
18 changed files with 41 additions and 37 deletions
|
@ -24,10 +24,10 @@
|
|||
#ifndef __CCHECKBOX_H
|
||||
#define __CCHECKBOX_H
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QCheckBox>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
|
||||
#ifndef __CCHECKBOX_CPP
|
||||
|
|
|
@ -24,11 +24,12 @@
|
|||
#ifndef __CCLIPBOARD_H
|
||||
#define __CCLIPBOARD_H
|
||||
|
||||
#include <QMimeData>
|
||||
#include <QDropEvent>
|
||||
|
||||
#include "gambas.h"
|
||||
#include "CWidget.h"
|
||||
#include "CPicture.h"
|
||||
#include <QMimeData>
|
||||
#include <QDropEvent>
|
||||
|
||||
typedef
|
||||
struct {
|
||||
|
|
|
@ -24,13 +24,13 @@
|
|||
#ifndef __CDRAWINGAREA_H
|
||||
#define __CDRAWINGAREA_H
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QPaintEvent>
|
||||
#include <QPixmap>
|
||||
#include <QEvent>
|
||||
//#include <QFrame>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
#include "CContainer.h"
|
||||
|
||||
|
|
|
@ -24,13 +24,13 @@
|
|||
#ifndef __CFRAME_H
|
||||
#define __CFRAME_H
|
||||
|
||||
#include <QGroupBox>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
#include "CContainer.h"
|
||||
|
||||
#include <QGroupBox>
|
||||
|
||||
#ifndef __CFRAME_CPP
|
||||
extern GB_DESC CFrameDesc[];
|
||||
#else
|
||||
|
|
|
@ -24,13 +24,13 @@
|
|||
#ifndef __CLABEL_H
|
||||
#define __CLABEL_H
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QLabel>
|
||||
#include <QEvent>
|
||||
#include <QPaintEvent>
|
||||
#include <QResizeEvent>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
#include "CPicture.h"
|
||||
#include "CContainer.h"
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
#ifndef __CMENU_H
|
||||
#define __CMENU_H
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
|
@ -33,6 +31,8 @@
|
|||
#include <QList>
|
||||
#include <QPoint>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
#include "CPicture.h"
|
||||
|
||||
|
|
|
@ -24,10 +24,10 @@
|
|||
#ifndef __CRADIOBUTTON_H
|
||||
#define __CRADIOBUTTON_H
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QRadioButton>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
|
||||
#ifndef __CRADIOBUTTON_CPP
|
||||
|
|
|
@ -24,11 +24,13 @@
|
|||
#ifndef __CSLIDER_H
|
||||
#define __CSLIDER_H
|
||||
|
||||
#include "gambas.h"
|
||||
#include "CWidget.h"
|
||||
#include <QSlider>
|
||||
#include <QResizeEvent>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
|
||||
#ifndef __CSLIDER_CPP
|
||||
|
||||
extern GB_DESC CSliderDesc[];
|
||||
|
|
|
@ -24,6 +24,10 @@
|
|||
#ifndef __CTABSTRIP_H
|
||||
#define __CTABSTRIP_H
|
||||
|
||||
#include <QTabWidget>
|
||||
#include <QTabBar>
|
||||
#include <QEvent>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
|
@ -31,10 +35,6 @@
|
|||
#include "CPicture.h"
|
||||
#include "CFont.h"
|
||||
|
||||
#include <QTabWidget>
|
||||
#include <QTabBar>
|
||||
#include <QEvent>
|
||||
|
||||
#ifndef __CTABSTRIP_CPP
|
||||
extern GB_DESC CTabStripDesc[];
|
||||
extern GB_DESC CTabStripContainerDesc[];
|
||||
|
|
|
@ -24,12 +24,12 @@
|
|||
#ifndef __CTEXTAREA_H
|
||||
#define __CTEXTAREA_H
|
||||
|
||||
#include <QPlainTextEdit>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
|
||||
#include <QPlainTextEdit>
|
||||
|
||||
#ifndef __CTEXTAREA_CPP
|
||||
extern GB_DESC CTextAreaDesc[];
|
||||
extern GB_DESC CTextAreaSelectionDesc[];
|
||||
|
|
|
@ -24,11 +24,11 @@
|
|||
#ifndef __CTEXTBOX_H
|
||||
#define __CTEXTBOX_H
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QEvent>
|
||||
|
||||
#include "gambas.h"
|
||||
|
||||
#include "CWidget.h"
|
||||
|
||||
#ifndef __CTEXTBOX_CPP
|
||||
|
|
|
@ -24,11 +24,12 @@
|
|||
#ifndef __CTRAYICON_H
|
||||
#define __CTRAYICON_H
|
||||
|
||||
#include <QSystemTrayIcon>
|
||||
|
||||
#include "gambas.h"
|
||||
#include "main.h"
|
||||
|
||||
#include "CPicture.h"
|
||||
#include <QSystemTrayIcon>
|
||||
|
||||
#ifndef __CTRAYICON_CPP
|
||||
extern GB_DESC TrayIconsDesc[];
|
||||
|
|
|
@ -26,9 +26,6 @@
|
|||
#include "main.h"
|
||||
#include "gambas.h"
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qdial.h>
|
||||
|
||||
#include "CDial.h"
|
||||
|
||||
DECLARE_EVENT(EVENT_Change);
|
||||
|
|
|
@ -24,6 +24,9 @@
|
|||
#ifndef __CDIAL_H
|
||||
#define __CDIAL_H
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qdial.h>
|
||||
|
||||
#include "gambas.h"
|
||||
#include "../gb.qt.h"
|
||||
|
||||
|
|
|
@ -24,11 +24,11 @@
|
|||
#ifndef __CTEXTEDIT_H
|
||||
#define __CTEXTEDIT_H
|
||||
|
||||
#include <QTextEdit>
|
||||
|
||||
#include "gambas.h"
|
||||
#include "../gb.qt.h"
|
||||
|
||||
#include <QTextEdit>
|
||||
|
||||
#ifndef __CTEXTEDIT_CPP
|
||||
extern GB_DESC CTextEditSelectionDesc[];
|
||||
extern GB_DESC CTextEditFormatDesc[];
|
||||
|
|
|
@ -24,9 +24,6 @@
|
|||
#ifndef __MAIN_H
|
||||
#define __MAIN_H
|
||||
|
||||
#include "gb_common.h"
|
||||
#include "gambas.h"
|
||||
|
||||
#include <QEvent>
|
||||
#include <QApplication>
|
||||
#include <QTimerEvent>
|
||||
|
@ -35,6 +32,9 @@
|
|||
#include <QClipboard>
|
||||
#include <QFont>
|
||||
|
||||
#include "gb_common.h"
|
||||
#include "gambas.h"
|
||||
|
||||
#define DO_NOT_USE_QT_INTERFACE
|
||||
#include "gb.qt.h"
|
||||
#include "gb.image.h"
|
||||
|
|
|
@ -24,12 +24,12 @@
|
|||
#ifndef __CCOOKIEJAR_H
|
||||
#define __CCOOKIEJAR_H
|
||||
|
||||
#include "main.h"
|
||||
|
||||
#include <QUrl>
|
||||
#include <QNetworkCookie>
|
||||
#include <QNetworkCookieJar>
|
||||
|
||||
#include "main.h"
|
||||
|
||||
#ifndef __CCOOKIEJAR_CPP
|
||||
|
||||
extern GB_DESC CookieDesc[];
|
||||
|
|
|
@ -24,10 +24,10 @@
|
|||
#ifndef __CGLAREA_H
|
||||
#define __CGLAREA_H
|
||||
|
||||
#include "main.h"
|
||||
|
||||
#include <QOpenGLWidget>
|
||||
|
||||
#include "main.h"
|
||||
|
||||
typedef
|
||||
struct {
|
||||
QT_WIDGET widget;
|
||||
|
|
Loading…
Reference in a new issue