1
0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00

Merge branch 'develop' of https://gitee.com/drabel/LibQQt into develop

# Conflicts:
#	demo/TouchMonitorServer/main.cpp
#	demo/TouchMonitorServer/qqtosdform.cpp
This commit is contained in:
tianduanrui 2018-05-07 15:49:20 +08:00
commit 2ae5dbf332
4 changed files with 17 additions and 7 deletions

View File

@ -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();
//w.setWindowOpacity ( 1 );
//w.setWindowFlags ( Qt::FramelessWindowHint );

View File

@ -1,4 +1,4 @@
#include "qqtosdform.h"
#include "qqtosdform.h"
#include "ui_qqtosdform.h"
#include <QPainter>
#include <QBitmap>

View File

@ -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 );

View File

@ -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 );