diff --git a/demo/TouchMonitorServer/main.cpp b/demo/TouchMonitorServer/main.cpp index 454a2767..c9302a38 100644 --- a/demo/TouchMonitorServer/main.cpp +++ b/demo/TouchMonitorServer/main.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "mainwindow.h" #include #include #include @@ -14,7 +14,10 @@ int main ( int argc, char* argv[] ) MainWindow w; //TestWidget w; + //macOS success //QQtOsdForm w; + //macOS success + //QQtOSDWidget w; w.show(); //w.setWindowOpacity ( 1 ); //w.setWindowFlags ( Qt::FramelessWindowHint ); diff --git a/demo/TouchMonitorServer/qqtosdform.cpp b/demo/TouchMonitorServer/qqtosdform.cpp index 1ad24fd6..bb0b3430 100644 --- a/demo/TouchMonitorServer/qqtosdform.cpp +++ b/demo/TouchMonitorServer/qqtosdform.cpp @@ -1,4 +1,4 @@ -#include "qqtosdform.h" +#include "qqtosdform.h" #include "ui_qqtosdform.h" #include #include diff --git a/src/exquisite/colorwidgets/qqtcolorlabel.h b/src/exquisite/colorwidgets/qqtcolorlabel.h index f3ffb6ca..069a09a9 100644 --- a/src/exquisite/colorwidgets/qqtcolorlabel.h +++ b/src/exquisite/colorwidgets/qqtcolorlabel.h @@ -1,15 +1,18 @@ -#ifndef QQTCOLORLABEL_H +#ifndef QQTCOLORLABEL_H #define QQTCOLORLABEL_H #include #include -class QQtColorLabel : public QLabel +#include +#include + +class QQTSHARED_EXPORT QQtColorLabel : public QLabel { Q_OBJECT public: explicit QQtColorLabel ( QWidget* parent = nullptr ); - virtual ~QQtColorLabel(); + virtual ~QQtColorLabel() {} void setColor ( const QRgb& rgb ); diff --git a/src/exquisite/colorwidgets/qqtcolorwidget.h b/src/exquisite/colorwidgets/qqtcolorwidget.h index 65b20cd3..4a7def68 100644 --- a/src/exquisite/colorwidgets/qqtcolorwidget.h +++ b/src/exquisite/colorwidgets/qqtcolorwidget.h @@ -1,13 +1,17 @@ -#ifndef QQTCOLORWIDGET_H +#ifndef QQTCOLORWIDGET_H #define QQTCOLORWIDGET_H #include -class QQtColorWidget : public QWidget +#include +#include + +class QQTSHARED_EXPORT QQtColorWidget : public QWidget { Q_OBJECT public: explicit QQtColorWidget ( QWidget* parent = nullptr ); + virtual ~QQtColorWidget() {} void setColor ( const QRgb& rgb );