forked from qt-creator/qt-creator
ADS: Fix compile for Qt < 5.12.2 and namespaced Qt
Change-Id: I552d19b1659598d98d0ef1900c79e3c93747ffb2 Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -42,7 +42,10 @@
|
|||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include <QtCore/QtGlobal>
|
#include <QtCore/QtGlobal>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
class QAbstractButton;
|
class QAbstractButton;
|
||||||
|
class QSplitter;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#ifndef ADS_STATIC
|
#ifndef ADS_STATIC
|
||||||
#ifdef ADVANCEDDOCKINGSYSTEM_LIBRARY
|
#ifdef ADVANCEDDOCKINGSYSTEM_LIBRARY
|
||||||
@@ -67,8 +70,6 @@ class QAbstractButton;
|
|||||||
// dumps to qDebug and std::cout after layout changes
|
// dumps to qDebug and std::cout after layout changes
|
||||||
#define ADS_DEBUG_LEVEL 0
|
#define ADS_DEBUG_LEVEL 0
|
||||||
|
|
||||||
class QSplitter;
|
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
enum eStateFileVersion { InitialVerison = 0, Version1 = 1, CurrentVersion = Version1 };
|
enum eStateFileVersion { InitialVerison = 0, Version1 = 1, CurrentVersion = Version1 };
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ QtcLibrary {
|
|||||||
name: "General"
|
name: "General"
|
||||||
files: [
|
files: [
|
||||||
"ads_globals.cpp", "ads_globals.h",
|
"ads_globals.cpp", "ads_globals.h",
|
||||||
"dockareaareatabbar.cpp", "dockareatabbar.h",
|
"dockareatabbar.cpp", "dockareatabbar.h",
|
||||||
"dockareatitlebar.cpp", "dockareatitlebar.h",
|
"dockareatitlebar.cpp", "dockareatitlebar.h",
|
||||||
"dockareawidget.cpp", "dockareawidget.h",
|
"dockareawidget.cpp", "dockareawidget.h",
|
||||||
"dockcomponentsfactory.cpp", "dockcomponentsfactory.h",
|
"dockcomponentsfactory.cpp", "dockcomponentsfactory.h",
|
||||||
|
|||||||
@@ -40,7 +40,9 @@
|
|||||||
#include <QFrame>
|
#include <QFrame>
|
||||||
#include <QToolButton>
|
#include <QToolButton>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
class QAbstractButton;
|
class QAbstractButton;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
|
|||||||
@@ -40,8 +40,10 @@
|
|||||||
|
|
||||||
#include <QFrame>
|
#include <QFrame>
|
||||||
|
|
||||||
class QXmlStreamWriter;
|
QT_BEGIN_NAMESPACE
|
||||||
class QAbstractButton;
|
class QAbstractButton;
|
||||||
|
class QXmlStreamWriter;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,9 @@
|
|||||||
|
|
||||||
#include <QFrame>
|
#include <QFrame>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
class QXmlStreamWriter;
|
class QXmlStreamWriter;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
|
|||||||
@@ -52,8 +52,10 @@
|
|||||||
#include <QtGui/QIcon>
|
#include <QtGui/QIcon>
|
||||||
#include <qobjectdefs.h>
|
#include <qobjectdefs.h>
|
||||||
|
|
||||||
class QSettings;
|
QT_BEGIN_NAMESPACE
|
||||||
class QMenu;
|
class QMenu;
|
||||||
|
class QSettings;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,9 @@
|
|||||||
#include <QPointer>
|
#include <QPointer>
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
class QGridLayout;
|
class QGridLayout;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
|
|||||||
@@ -39,8 +39,10 @@
|
|||||||
|
|
||||||
#include <QFrame>
|
#include <QFrame>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
class QToolBar;
|
class QToolBar;
|
||||||
class QXmlStreamWriter;
|
class QXmlStreamWriter;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
namespace ADS {
|
namespace ADS {
|
||||||
|
|
||||||
|
|||||||
@@ -388,10 +388,10 @@ namespace ADS
|
|||||||
d->setState(DraggingMousePressed);
|
d->setState(DraggingMousePressed);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
if (e->type() == QEvent::NonClientAreaMouseButtonPress
|
if (event->type() == QEvent::NonClientAreaMouseButtonPress
|
||||||
&& QGuiApplication::mouseButtons().testFlag(Qt::LeftButton)) {
|
&& QGuiApplication::mouseButtons().testFlag(Qt::LeftButton)) {
|
||||||
qCInfo(adsLog) << Q_FUNC_INFO << "QEvent::NonClientAreaMouseButtonPress"
|
qCInfo(adsLog) << Q_FUNC_INFO << "QEvent::NonClientAreaMouseButtonPress"
|
||||||
<< e->type();
|
<< event->type();
|
||||||
d->setState(DraggingMousePressed);
|
d->setState(DraggingMousePressed);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user