QT/LibQQt
1
0
Fork 0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00
Code Issues Projects Releases Wiki Activity

支持WinRT编译。

Browse Source
This commit is contained in:
tianduanrui 2019-09-19 20:03:59 +08:00
parent 5cb5fed2cd
commit 5521e799c3
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/exquisite/qqtbodymover_p.cpp
View File

@ -50,7 +50,7 @@ void QQtBodyMoverPrivate::mousePressEvent ( QMouseEvent* event, QWidget* target
return;
}
#ifdef Q_OS_WIN
#ifdef __DESKTOP_WIN__
if ( ReleaseCapture() )
{
QWidget* pWindow = target->window();
@ -75,7 +75,7 @@ void QQtBodyMoverPrivate::mousePressEvent ( QMouseEvent* event, QWidget* target
void QQtBodyMoverPrivate::mouseReleaseEvent ( QMouseEvent* event, QWidget* target )
{
Q_ASSERT ( target );
#ifdef Q_OS_WIN
#ifdef __DESKTOP_WIN__
#else
bMousePressed = false;
event->accept();
@ -85,7 +85,7 @@ void QQtBodyMoverPrivate::mouseReleaseEvent ( QMouseEvent* event, QWidget* targe
void QQtBodyMoverPrivate::mouseMoveEvent ( QMouseEvent* event, QWidget* target )
{
Q_ASSERT ( target );
#ifdef Q_OS_WIN
#ifdef __DESKTOP_WIN__
#else
QWidget* win = target->window();
if ( bMousePressed && !win->isMaximized() )

2
src/network/qqtnetwork.h
View File

@ -12,7 +12,9 @@
#include <qqtudpclient.h>
#include <qqtudpserver.h>
#ifdef __QQTSERIALPORT__
#include <qqtserialport.h>
#endif
#ifdef __BLUETOOTH__
#include <qqtbluetoothclient.h>

29
src/qqt_header.pri
View File

@ -247,9 +247,10 @@ defineTest(add_defines_QQt){
#plugin notifer, and plugin device managament.
#if you use DeviceWatcher , open this annotation
DEFINES += __PLUGINSUPPORT__
contains(QSYS_PRIVATE, iOS||iOSSimulator||macOS) {
contains(QSYS_PRIVATE, iOS||iOSSimulator||macOS||WinRT) {
DEFINES -= __PLUGINSUPPORT__
}
contains (DEFINES, __PLUGINSUPPORT__) {
#contains(QSYS_PRIVATE, Win32|Windows|Win64 || MSVC32|MSVC|MSVC64) {
win32 {
@ -284,7 +285,8 @@ defineTest(add_defines_QQt){
}
#Qt 5.9.2, android support this feature
#Qt 5.9.2, ios can't use printsupport
contains(QSYS_PRIVATE, iOS||iOSSimulator) {
#Qt 5.12.2, winrt has no QPrinter.
contains(QSYS_PRIVATE, iOS||iOSSimulator||WinRT) {
DEFINES -= __PRINTSUPPORT__
}
contains (DEFINES, __PRINTSUPPORT__) {
@ -353,11 +355,22 @@ defineTest(add_defines_QQt){
#if compiler QtSerialPort module manual, note this line is a good idea. default: qt4 qextserialport
lessThan(QT_MAJOR_VERSION, 5): DEFINES += __QEXTSERIALPORT__
#to winRT, ues qextserialport
contains (DEFINES, __WINRT__): DEFINES += __QEXTSERIALPORT__
#to ios, use qextserialport
contains (DEFINES, __IOS__): DEFINES += __QEXTSERIALPORT__
#android qt5 has QtSerialport?
#android qt5 has QtSerialport
#contains (DEFINES, __ANDROID__): DEFINES += __QSERIALPORT__
#Win32 Win64 MSVC MSVC64, macOS, Linux64, Embedded, use QSerialPort
else: DEFINES += __QSERIALPORT__
#to winRT, can't use any serialport
contains (DEFINES, __WINRT__): DEFINES -= __QEXTSERIALPORT__ __QSERIALPORT__
#__QEXTSERIALPORT__ __QSERIALPORT__ qextserialport Qt4 多数平台
#__QEXTSERIALPORT__ qextserialport Qt5 偶尔
#__QSERIALPORT__ qtserialport Qt5 多数平台
#一个都没有 WinRT
contains (DEFINES, __QEXTSERIALPORT__) {
CONFIG += thread
unix:DEFINES += _TTY_POSIX_
@ -365,7 +378,8 @@ defineTest(add_defines_QQt){
#Qt4 is not a very good Cross Qt version, Qt5 suggest.
win32:LIBS += -lsetupapi -ladvapi32
#message ( __QEXTSERIALPORT__ Defined in $${TARGET})
} else {
DEFINES += __QQTSERIALPORT__
} else: contains (DEFINES, __QSERIALPORT__) {
#message ( __QSERIALPORT__ Defined in $${TARGET})
lessThan(QT_MAJOR_VERSION, 5): CONFIG += serialport
else:QT += serialport
@ -374,6 +388,7 @@ defineTest(add_defines_QQt){
} else {
DEFINES += _TTY_WIN_
}
DEFINES += __QQTSERIALPORT__
}
##################Bluetooth Module###############################
@ -611,7 +626,7 @@ defineTest(add_defines_QQt){
win32 {
LIBS += -luser32
contains (DEFINES, __OPENGLWIDGETS__) {
contains (DEFINES, __OPENGLWIDGETS__):!contains(QSYS_PRIVATE, WinRT) {
LIBS += -lopengl32 -lglu32
}
}else: unix {

6
src/qqt_source.pri
View File

@ -285,8 +285,10 @@ contains (DEFINES, __NETWORKSUPPORT__) {
}
#serialport iodevice
SOURCES += $$PWD/network/qqtserialport.cpp
HEADERS += $$PWD/network/qqtserialport.h
contains(DEFINES, __QQTSERIALPORT__){
SOURCES += $$PWD/network/qqtserialport.cpp
HEADERS += $$PWD/network/qqtserialport.h
}
#bluetooth iodevice
#注释：在qqt_header.pri打开 DEFINES += __BLUETOOTH__

6
src/widgets/qqttitlebar.cpp
View File

@ -127,7 +127,7 @@ void QQtTitleBar::mouseDoubleClickEvent ( QMouseEvent* event )
void QQtTitleBar::mousePressEvent ( QMouseEvent* event )
{
#ifdef Q_OS_WIN
#ifdef __DESKTOP_WIN__
if ( ReleaseCapture() )
{
QWidget* pWindow = this->window();
@ -150,7 +150,7 @@ void QQtTitleBar::mousePressEvent ( QMouseEvent* event )
void QQtTitleBar::mouseReleaseEvent ( QMouseEvent* event )
{
#ifdef Q_OS_WIN
#ifdef __DESKTOP_WIN__
#else
bMousePressed = false;
event->ignore();
@ -160,7 +160,7 @@ void QQtTitleBar::mouseReleaseEvent ( QMouseEvent* event )
void QQtTitleBar::mouseMoveEvent ( QMouseEvent* event )
{
#ifdef Q_OS_WIN
#ifdef __DESKTOP_WIN__
#else
QWidget* win = window();
if ( bMousePressed && !win->isMaximized() )