diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bf2165..cf3dddf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,14 +19,14 @@ jobs: matrix: qt-version: [5.15.2, 6.4.1] library-type: [shared, static] - platform: [windows-latest, macos-latest] # ubuntu-latest + platform: [windows-latest, ubuntu-latest, macos-latest] include: - platform: windows-latest CC: cl CXX: cl - #- platform: ubuntu-latest - # CC: gcc - # CXX: g++ + - platform: ubuntu-latest + CC: gcc + CXX: g++ - platform: macos-latest CC: clang CXX: clang++ diff --git a/include/FramelessHelper/Core/chromepalette.h b/include/FramelessHelper/Core/chromepalette.h index 1121ce9..46a2cae 100644 --- a/include/FramelessHelper/Core/chromepalette.h +++ b/include/FramelessHelper/Core/chromepalette.h @@ -121,7 +121,7 @@ Q_SIGNALS: void chromeButtonColorChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Core/framelessmanager.h b/include/FramelessHelper/Core/framelessmanager.h index e493fe6..098cd74 100644 --- a/include/FramelessHelper/Core/framelessmanager.h +++ b/include/FramelessHelper/Core/framelessmanager.h @@ -62,7 +62,7 @@ Q_SIGNALS: void wallpaperChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Core/micamaterial.h b/include/FramelessHelper/Core/micamaterial.h index 75d96d9..030763c 100644 --- a/include/FramelessHelper/Core/micamaterial.h +++ b/include/FramelessHelper/Core/micamaterial.h @@ -65,7 +65,7 @@ Q_SIGNALS: void shouldRedraw(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Core/windowborderpainter.h b/include/FramelessHelper/Core/windowborderpainter.h index f2cbb91..b9bb52c 100644 --- a/include/FramelessHelper/Core/windowborderpainter.h +++ b/include/FramelessHelper/Core/windowborderpainter.h @@ -78,7 +78,7 @@ Q_SIGNALS: void shouldRepaint(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Quick/framelessquickhelper.h b/include/FramelessHelper/Quick/framelessquickhelper.h index 719a475..ce775da 100644 --- a/include/FramelessHelper/Quick/framelessquickhelper.h +++ b/include/FramelessHelper/Quick/framelessquickhelper.h @@ -101,7 +101,7 @@ Q_SIGNALS: void ready(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h index 91e2d6b..8c52a27 100644 --- a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h @@ -77,7 +77,7 @@ Q_SIGNALS: void fullScreenChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Quick/private/framelessquickwindow_p.h b/include/FramelessHelper/Quick/private/framelessquickwindow_p.h index 726a448..3643c22 100644 --- a/include/FramelessHelper/Quick/private/framelessquickwindow_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickwindow_p.h @@ -77,7 +77,7 @@ Q_SIGNALS: void fullScreenChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Quick/quickimageitem.h b/include/FramelessHelper/Quick/quickimageitem.h index e37ec1d..3dafbd1 100644 --- a/include/FramelessHelper/Quick/quickimageitem.h +++ b/include/FramelessHelper/Quick/quickimageitem.h @@ -61,7 +61,7 @@ Q_SIGNALS: void sourceChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Quick/quickmicamaterial.h b/include/FramelessHelper/Quick/quickmicamaterial.h index ebc05f3..106bfea 100644 --- a/include/FramelessHelper/Quick/quickmicamaterial.h +++ b/include/FramelessHelper/Quick/quickmicamaterial.h @@ -53,7 +53,7 @@ protected: void componentComplete() override; private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Quick/quickwindowborder.h b/include/FramelessHelper/Quick/quickwindowborder.h index 6441f04..db4335f 100644 --- a/include/FramelessHelper/Quick/quickwindowborder.h +++ b/include/FramelessHelper/Quick/quickwindowborder.h @@ -87,7 +87,7 @@ Q_SIGNALS: void nativeBorderChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Widgets/framelessdialog.h b/include/FramelessHelper/Widgets/framelessdialog.h index aa48352..04a18c3 100644 --- a/include/FramelessHelper/Widgets/framelessdialog.h +++ b/include/FramelessHelper/Widgets/framelessdialog.h @@ -44,7 +44,7 @@ public: ~FramelessDialog() override; private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Widgets/framelessmainwindow.h b/include/FramelessHelper/Widgets/framelessmainwindow.h index 62a26f4..b27a3b9 100644 --- a/include/FramelessHelper/Widgets/framelessmainwindow.h +++ b/include/FramelessHelper/Widgets/framelessmainwindow.h @@ -59,7 +59,7 @@ Q_SIGNALS: void zoomedChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Widgets/framelesswidget.h b/include/FramelessHelper/Widgets/framelesswidget.h index fc800cf..c299e3d 100644 --- a/include/FramelessHelper/Widgets/framelesswidget.h +++ b/include/FramelessHelper/Widgets/framelesswidget.h @@ -59,7 +59,7 @@ Q_SIGNALS: void zoomedChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h index 68e2c38..d5b1ddc 100644 --- a/include/FramelessHelper/Widgets/framelesswidgetshelper.h +++ b/include/FramelessHelper/Widgets/framelesswidgetshelper.h @@ -88,7 +88,7 @@ Q_SIGNALS: void ready(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Widgets/standardsystembutton.h b/include/FramelessHelper/Widgets/standardsystembutton.h index 8330b23..bacd796 100644 --- a/include/FramelessHelper/Widgets/standardsystembutton.h +++ b/include/FramelessHelper/Widgets/standardsystembutton.h @@ -100,7 +100,7 @@ Q_SIGNALS: void iconSize2Changed(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/include/FramelessHelper/Widgets/standardtitlebar.h b/include/FramelessHelper/Widgets/standardtitlebar.h index 33876aa..041ba9d 100644 --- a/include/FramelessHelper/Widgets/standardtitlebar.h +++ b/include/FramelessHelper/Widgets/standardtitlebar.h @@ -98,7 +98,7 @@ Q_SIGNALS: void titleFontChanged(); private: - std::unique_ptr d_ptr = nullptr; + QScopedPointer d_ptr; }; FRAMELESSHELPER_END_NAMESPACE diff --git a/src/core/chromepalette.cpp b/src/core/chromepalette.cpp index 56be7d0..dffbe4d 100644 --- a/src/core/chromepalette.cpp +++ b/src/core/chromepalette.cpp @@ -138,7 +138,7 @@ void ChromePalettePrivate::refresh() } ChromePalette::ChromePalette(QObject *parent) : - QObject(parent), d_ptr(std::make_unique(this)) + QObject(parent), d_ptr(new ChromePalettePrivate(this)) { } diff --git a/src/core/framelessmanager.cpp b/src/core/framelessmanager.cpp index de517dc..7503137 100644 --- a/src/core/framelessmanager.cpp +++ b/src/core/framelessmanager.cpp @@ -371,7 +371,7 @@ void FramelessManagerPrivate::initialize() } FramelessManager::FramelessManager(QObject *parent) : - QObject(parent), d_ptr(std::make_unique(this)) + QObject(parent), d_ptr(new FramelessManagerPrivate(this)) { } diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp index a354748..f5b6cc8 100644 --- a/src/core/micamaterial.cpp +++ b/src/core/micamaterial.cpp @@ -664,7 +664,7 @@ void MicaMaterialPrivate::prepareGraphicsResources() } MicaMaterial::MicaMaterial(QObject *parent) - : QObject(parent), d_ptr(std::make_unique(this)) + : QObject(parent), d_ptr(new MicaMaterialPrivate(this)) { } diff --git a/src/core/windowborderpainter.cpp b/src/core/windowborderpainter.cpp index f2256b6..16e9a1d 100644 --- a/src/core/windowborderpainter.cpp +++ b/src/core/windowborderpainter.cpp @@ -174,7 +174,7 @@ void WindowBorderPainterPrivate::initialize() } WindowBorderPainter::WindowBorderPainter(QObject *parent) - : QObject(parent), d_ptr(std::make_unique(this)) + : QObject(parent), d_ptr(new WindowBorderPainterPrivate(this)) { } diff --git a/src/quick/framelessquickapplicationwindow.cpp b/src/quick/framelessquickapplicationwindow.cpp index cef3029..a7ef082 100644 --- a/src/quick/framelessquickapplicationwindow.cpp +++ b/src/quick/framelessquickapplicationwindow.cpp @@ -170,7 +170,7 @@ void FramelessQuickApplicationWindowPrivate::initialize() } FramelessQuickApplicationWindow::FramelessQuickApplicationWindow(QWindow *parent) - : QQuickApplicationWindow(parent), d_ptr(std::make_unique(this)) + : QQuickApplicationWindow(parent), d_ptr(new FramelessQuickApplicationWindowPrivate(this)) { } diff --git a/src/quick/framelessquickhelper.cpp b/src/quick/framelessquickhelper.cpp index 06a3ddc..4faa40f 100644 --- a/src/quick/framelessquickhelper.cpp +++ b/src/quick/framelessquickhelper.cpp @@ -957,7 +957,7 @@ void FramelessQuickHelperPrivate::rebindWindow() } FramelessQuickHelper::FramelessQuickHelper(QQuickItem *parent) - : QQuickItem(parent), d_ptr(std::make_unique(this)) + : QQuickItem(parent), d_ptr(new FramelessQuickHelperPrivate(this)) { } diff --git a/src/quick/framelessquickwindow.cpp b/src/quick/framelessquickwindow.cpp index 07b92e9..69ebebb 100644 --- a/src/quick/framelessquickwindow.cpp +++ b/src/quick/framelessquickwindow.cpp @@ -170,7 +170,7 @@ void FramelessQuickWindowPrivate::initialize() } FramelessQuickWindow::FramelessQuickWindow(QWindow *parent) - : QQuickWindowQmlImpl(parent), d_ptr(std::make_unique(this)) + : QQuickWindowQmlImpl(parent), d_ptr(new FramelessQuickWindowPrivate(this)) { } diff --git a/src/quick/quickimageitem.cpp b/src/quick/quickimageitem.cpp index 1ba2f8b..395a8e0 100644 --- a/src/quick/quickimageitem.cpp +++ b/src/quick/quickimageitem.cpp @@ -220,7 +220,7 @@ QRect QuickImageItemPrivate::paintArea() const } QuickImageItem::QuickImageItem(QQuickItem *parent) - : QQuickPaintedItem(parent), d_ptr(std::make_unique(this)) + : QQuickPaintedItem(parent), d_ptr(new QuickImageItemPrivate(this)) { } diff --git a/src/quick/quickmicamaterial.cpp b/src/quick/quickmicamaterial.cpp index bdab9af..0028d23 100644 --- a/src/quick/quickmicamaterial.cpp +++ b/src/quick/quickmicamaterial.cpp @@ -244,7 +244,7 @@ void QuickMicaMaterialPrivate::appendNode(WallpaperImageNode *node) } QuickMicaMaterial::QuickMicaMaterial(QQuickItem *parent) - : QQuickItem(parent), d_ptr(std::make_unique(this)) + : QQuickItem(parent), d_ptr(new QuickMicaMaterialPrivate(this)) { } diff --git a/src/quick/quickwindowborder.cpp b/src/quick/quickwindowborder.cpp index 8e32481..f3be3ec 100644 --- a/src/quick/quickwindowborder.cpp +++ b/src/quick/quickwindowborder.cpp @@ -192,7 +192,7 @@ void QuickWindowBorderPrivate::rebindWindow() } QuickWindowBorder::QuickWindowBorder(QQuickItem *parent) - : QQuickPaintedItem(parent), d_ptr(std::make_unique(this)) + : QQuickPaintedItem(parent), d_ptr(new QuickWindowBorderPrivate(this)) { } diff --git a/src/widgets/framelessdialog.cpp b/src/widgets/framelessdialog.cpp index 152c26e..602fb7d 100644 --- a/src/widgets/framelessdialog.cpp +++ b/src/widgets/framelessdialog.cpp @@ -90,7 +90,7 @@ WidgetsSharedHelper *FramelessDialogPrivate::widgetsSharedHelper() const } FramelessDialog::FramelessDialog(QWidget *parent) - : QDialog(parent), d_ptr(std::make_unique(this)) + : QDialog(parent), d_ptr(new FramelessDialogPrivate(this)) { } diff --git a/src/widgets/framelessmainwindow.cpp b/src/widgets/framelessmainwindow.cpp index 7369e4a..f690134 100644 --- a/src/widgets/framelessmainwindow.cpp +++ b/src/widgets/framelessmainwindow.cpp @@ -123,7 +123,7 @@ WidgetsSharedHelper *FramelessMainWindowPrivate::widgetsSharedHelper() const } FramelessMainWindow::FramelessMainWindow(QWidget *parent, const Qt::WindowFlags flags) - : QMainWindow(parent, flags), d_ptr(std::make_unique(this)) + : QMainWindow(parent, flags), d_ptr(new FramelessMainWindowPrivate(this)) { } diff --git a/src/widgets/framelesswidget.cpp b/src/widgets/framelesswidget.cpp index 086fed8..2840bf0 100644 --- a/src/widgets/framelesswidget.cpp +++ b/src/widgets/framelesswidget.cpp @@ -123,7 +123,7 @@ WidgetsSharedHelper *FramelessWidgetPrivate::widgetsSharedHelper() const } FramelessWidget::FramelessWidget(QWidget *parent) - : QWidget(parent), d_ptr(std::make_unique(this)) + : QWidget(parent), d_ptr(new FramelessWidgetPrivate(this)) { } diff --git a/src/widgets/framelesswidgetshelper.cpp b/src/widgets/framelesswidgetshelper.cpp index f35e48a..1e2deb7 100644 --- a/src/widgets/framelesswidgetshelper.cpp +++ b/src/widgets/framelesswidgetshelper.cpp @@ -882,7 +882,7 @@ void FramelessWidgetsHelperPrivate::setSystemButton(QWidget *widget, const Syste } FramelessWidgetsHelper::FramelessWidgetsHelper(QObject *parent) - : QObject(parent), d_ptr(std::make_unique(this)) + : QObject(parent), d_ptr(new FramelessWidgetsHelperPrivate(this)) { } diff --git a/src/widgets/standardsystembutton.cpp b/src/widgets/standardsystembutton.cpp index 9cbdca3..5537195 100644 --- a/src/widgets/standardsystembutton.cpp +++ b/src/widgets/standardsystembutton.cpp @@ -399,7 +399,7 @@ void StandardSystemButtonPrivate::initialize() } StandardSystemButton::StandardSystemButton(QWidget *parent) - : QAbstractButton(parent), d_ptr(std::make_unique(this)) + : QAbstractButton(parent), d_ptr(new StandardSystemButtonPrivate(this)) { } diff --git a/src/widgets/standardtitlebar.cpp b/src/widgets/standardtitlebar.cpp index ca79a30..f0a8fa5 100644 --- a/src/widgets/standardtitlebar.cpp +++ b/src/widgets/standardtitlebar.cpp @@ -504,7 +504,7 @@ void StandardTitleBarPrivate::initialize() } StandardTitleBar::StandardTitleBar(QWidget *parent) - : QWidget(parent), d_ptr(std::make_unique(this)) + : QWidget(parent), d_ptr(new StandardTitleBarPrivate(this)) { }