From 5fd9db7df2a920c2181dc1f7c21854ce63a184f5 Mon Sep 17 00:00:00 2001
From: tianduanrui <2407223896@qq.com>
Date: Sun, 6 May 2018 17:25:25 +0800
Subject: [PATCH] update

---
 demo/TouchMonitorServer/main.cpp            | 5 ++++-
 demo/TouchMonitorServer/qqtosdform.cpp      | 6 +++---
 src/exquisite/colorwidgets/qqtcolorlabel.h  | 9 ++++++---
 src/exquisite/colorwidgets/qqtcolorwidget.h | 8 ++++++--
 src/linux_cd_path.sh                        | 0
 src/linux_cp_files.sh                       | 0
 src/linux_cur_path.sh                       | 0
 7 files changed, 19 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 src/linux_cd_path.sh
 mode change 100644 => 100755 src/linux_cp_files.sh
 mode change 100644 => 100755 src/linux_cur_path.sh

diff --git a/demo/TouchMonitorServer/main.cpp b/demo/TouchMonitorServer/main.cpp
index 400e1a0c..28c79091 100644
--- a/demo/TouchMonitorServer/main.cpp
+++ b/demo/TouchMonitorServer/main.cpp
@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "mainwindow.h"
 #include <QQtApplication>
 #include <qqtosdwidget.h>
 #include <testwidget.h>
@@ -14,7 +14,10 @@ int main ( int argc, char* argv[] )
 
     //MainWindow w;
     //TestWidget w;
+    //macOS success
     QQtOsdForm w;
+    //macOS success
+    //QQtOSDWidget w;
     w.show();
 
     return a.exec();
diff --git a/demo/TouchMonitorServer/qqtosdform.cpp b/demo/TouchMonitorServer/qqtosdform.cpp
index afbe3861..eb734ec2 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 <QPainter>
 #include <QBitmap>
@@ -16,7 +16,7 @@ QQtOsdForm::QQtOsdForm ( QWidget* parent ) :
 
     QPalette pal = palette();
     pal.setColor ( QPalette::Background, QColor ( 255, 255, 255, 255 ) );
-    setPalette ( pal );
+    //setPalette ( pal );
 
 }
 
@@ -28,7 +28,7 @@ QQtOsdForm::~QQtOsdForm()
 
 void QQtOsdForm::paintEvent ( QPaintEvent* event )
 {
-    //return QWidget::paintEvent ( event );
+    return QWidget::paintEvent ( event );
 
     // Use a bitmap as a mask. A bitmap only has two kind of colors: white(value is 0)
     // or black(other values). When we use it to set mask, we can see the window at the position
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 <QLabel>
 #include <QRgb>
 
-class QQtColorLabel : public QLabel
+#include <qqt-local.h>
+#include <qqtcore.h>
+
+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 <QWidget>
 
-class QQtColorWidget : public QWidget
+#include <qqt-local.h>
+#include <qqtcore.h>
+
+class QQTSHARED_EXPORT QQtColorWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit QQtColorWidget ( QWidget* parent = nullptr );
+    virtual ~QQtColorWidget() {}
 
     void setColor ( const QRgb& rgb );
 
diff --git a/src/linux_cd_path.sh b/src/linux_cd_path.sh
old mode 100644
new mode 100755
diff --git a/src/linux_cp_files.sh b/src/linux_cp_files.sh
old mode 100644
new mode 100755
diff --git a/src/linux_cur_path.sh b/src/linux_cur_path.sh
old mode 100644
new mode 100755