Replace QMacCocoaViewContainer with QWidget::createWindowContainer
This commit is contained in:
@@ -26,8 +26,6 @@ THE SOFTWARE.
|
||||
#include <QString>
|
||||
#include <QImage>
|
||||
#include <QPixmap>
|
||||
#include <QBoxLayout>
|
||||
#include <QMacCocoaViewContainer>
|
||||
|
||||
static inline NSString* fromQString(const QString &string) {
|
||||
|
||||
@@ -51,16 +49,3 @@ static inline NSImage* fromQPixmap(const QPixmap &pixmap) {
|
||||
return [ [NSImage alloc] initWithCGImage:cgImage size:NSZeroSize];
|
||||
|
||||
}
|
||||
|
||||
static inline void setupLayout(NSView *cocoaView, QWidget *parent) {
|
||||
|
||||
parent->setAttribute(Qt::WA_NativeWindow);
|
||||
QVBoxLayout *layout = new QVBoxLayout(parent);
|
||||
layout->setMargin(0);
|
||||
// FIXME
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
layout->addWidget(new QMacCocoaViewContainer(cocoaView, parent));
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user