Use the correct include path for Qt headers
This commit is contained in:
@@ -108,7 +108,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_GUI && defined(__WXQT__)
|
#if wxUSE_GUI && defined(__WXQT__)
|
||||||
#include <QtGlobal> // for QT_VERSION_STR constants
|
#include <QtCore/QtGlobal> // for QT_VERSION_STR constants
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_BASE
|
#if wxUSE_BASE
|
||||||
|
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
#include "wx/timer.h"
|
#include "wx/timer.h"
|
||||||
#include "wx/qt/private/timer.h"
|
#include "wx/qt/private/timer.h"
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtCore/QtGlobal>
|
||||||
|
|
||||||
wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
|
wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
|
||||||
{
|
{
|
||||||
|
@@ -12,8 +12,8 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QtWidgets/QApplication>
|
||||||
#include <QClipboard>
|
#include <QtGui/QClipboard>
|
||||||
|
|
||||||
#include "wx/clipbrd.h"
|
#include "wx/clipbrd.h"
|
||||||
#include "wx/scopedarray.h"
|
#include "wx/scopedarray.h"
|
||||||
|
@@ -12,8 +12,8 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QtWidgets/QApplication>
|
||||||
#include <QBitmap>
|
#include <QtGui/QBitmap>
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/bitmap.h"
|
#include "wx/bitmap.h"
|
||||||
|
@@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
#include <QtWidgets/QDesktopWidget>
|
#include <QtWidgets/QDesktopWidget>
|
||||||
#include <QtGui/QScreen>
|
#include <QtGui/QScreen>
|
||||||
#include <QApplication>
|
#include <QtWidgets/QApplication>
|
||||||
#include <QPixmap>
|
#include <QtGui/QPixmap>
|
||||||
|
|
||||||
wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
|
wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
|
||||||
|
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <QHeaderView>
|
#include <QtWidgets/QHeaderView>
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/bitmap.h"
|
#include "wx/bitmap.h"
|
||||||
|
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
#if wxUSE_TOOLBAR
|
#if wxUSE_TOOLBAR
|
||||||
|
|
||||||
#include <QActionGroup>
|
#include <QtWidgets/QActionGroup>
|
||||||
#include <QtWidgets/QToolButton>
|
#include <QtWidgets/QToolButton>
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
|
@@ -16,8 +16,8 @@
|
|||||||
#include "wx/private/uiaction.h"
|
#include "wx/private/uiaction.h"
|
||||||
|
|
||||||
#include <QtTest/QtTestGui>
|
#include <QtTest/QtTestGui>
|
||||||
#include <QApplication>
|
#include <QtWidgets/QApplication>
|
||||||
#include <QWidget>
|
#include <QtWidgets/QWidget>
|
||||||
|
|
||||||
#include "wx/qt/defs.h"
|
#include "wx/qt/defs.h"
|
||||||
#include "wx/qt/private/utils.h"
|
#include "wx/qt/private/utils.h"
|
||||||
|
Reference in New Issue
Block a user