From 763ec1027c05a79317cfbf41279c01aef01867f7 Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Mon, 23 Oct 2017 00:00:19 +0800 Subject: [PATCH] Support Qt4, compiled --- a0-qqtfoundation.pro | 4 ++-- src/exquisite/qqtcustomverificationcode.h | 2 +- src/exquisite/qqtframelesshelperprivate.cpp | 5 ++++- src/exquisite/qqtmarqueeeffectlabel.h | 1 - src/network/qqtwebclient.cpp | 24 ++++++++++----------- src/network/qqtwebclient.h | 11 +++++----- src/qqt.pro | 15 ++++++++----- src/qqt_header.pri | 4 ++++ 8 files changed, 39 insertions(+), 27 deletions(-) diff --git a/a0-qqtfoundation.pro b/a0-qqtfoundation.pro index 651b9de3..b045467f 100644 --- a/a0-qqtfoundation.pro +++ b/a0-qqtfoundation.pro @@ -3,9 +3,9 @@ CONFIG += ordered SUBDIRS = SUBDIRS += src/qqt.pro -SUBDIRS += examples/framelesshelperwidget +#SUBDIRS += examples/framelesshelperwidget #SUBDIRS += examples/qqtframe -#SUBDIRS += examples/qqtframe2 +SUBDIRS += examples/qqtframe2 #SUBDIRS += examples/animationframe #SUBDIRS += examples/cmdwidget #SUBDIRS += examples/qqtbluetoothfiletransferserver diff --git a/src/exquisite/qqtcustomverificationcode.h b/src/exquisite/qqtcustomverificationcode.h index 6491cb81..75ad2ee9 100644 --- a/src/exquisite/qqtcustomverificationcode.h +++ b/src/exquisite/qqtcustomverificationcode.h @@ -25,7 +25,7 @@ class QQTSHARED_EXPORT QQtCustomVerificationCode : public QWidget { Q_OBJECT public: - explicit QQtCustomVerificationCode(QWidget* parent = nullptr, quint16 width = 180, quint16 height = 50, quint8 count = 6); + explicit QQtCustomVerificationCode(QWidget* parent = 0, quint16 width = 180, quint16 height = 50, quint8 count = 6); /** * @brief generateOneCaptcha 生成一个验证码 diff --git a/src/exquisite/qqtframelesshelperprivate.cpp b/src/exquisite/qqtframelesshelperprivate.cpp index 55083dd6..0ec31e76 100644 --- a/src/exquisite/qqtframelesshelperprivate.cpp +++ b/src/exquisite/qqtframelesshelperprivate.cpp @@ -58,8 +58,11 @@ void QQtFramelessHelperPrivate::addDragWidget(QWidget* widget) void QQtFramelessHelperPrivate::checkPos() { QRect rectMustIn = parent->frameGeometry(); +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) QRect rectMustNotIn = rectMustIn.marginsRemoved(margins); - +#else + QRect rectMustNotIn = rectMustIn.adjusted(margins.left(), margins.top(), margins.right(), margins.bottom()); +#endif QPoint cursorPos = QCursor::pos(); if (isMaximized || diff --git a/src/exquisite/qqtmarqueeeffectlabel.h b/src/exquisite/qqtmarqueeeffectlabel.h index 49e72460..d80cf962 100644 --- a/src/exquisite/qqtmarqueeeffectlabel.h +++ b/src/exquisite/qqtmarqueeeffectlabel.h @@ -17,7 +17,6 @@ #include #include #include -#include #include #include "qqt-local.h" diff --git a/src/network/qqtwebclient.cpp b/src/network/qqtwebclient.cpp index 67424c80..63e55fc8 100644 --- a/src/network/qqtwebclient.cpp +++ b/src/network/qqtwebclient.cpp @@ -1,19 +1,19 @@ #include "qqtwebclient.h" #include "qqtcore.h" -QQtWebClient::QQtWebClient(QObject *parent) : QNetworkAccessManager(parent) +QQtWebClient::QQtWebClient(QObject* parent) : QNetworkAccessManager(parent) { connect(this, SIGNAL(finished(QNetworkReply*)), this, SLOT(finished(QNetworkReply*))); - connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), - this, SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*))); + connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), + this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); - connect(this, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), - this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); + connect(this, SIGNAL(proxyAuthenticationRequired(QNetworkProxy, QAuthenticator*)), + this, SLOT(proxyAuthenticationRequired(QNetworkProxy, QAuthenticator*))); - connect(this, SIGNAL(sslErrors(QNetworkReply*,QList)), - this, SLOT(sslErrors(QNetworkReply*,QList))); + connect(this, SIGNAL(sslErrors(QNetworkReply*, QList)), + this, SLOT(sslErrors(QNetworkReply*, QList))); connect(this, SIGNAL(networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility)), this, SLOT(networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility))); @@ -22,22 +22,22 @@ QQtWebClient::QQtWebClient(QObject *parent) : QNetworkAccessManager(parent) this, SLOT(networkSessionConnected())); } -void QQtWebClient::finished(QNetworkReply *reply) +void QQtWebClient::finished(QNetworkReply* reply) { pline() << reply; } -void QQtWebClient::authenticationRequired(QNetworkReply *r, QAuthenticator * a) +void QQtWebClient::authenticationRequired(QNetworkReply* r, QAuthenticator* a) { pline() << r << a; } -void QQtWebClient::proxyAuthenticationRequired(QNetworkProxy p, QAuthenticator * a) +void QQtWebClient::proxyAuthenticationRequired(QNetworkProxy p, QAuthenticator* a) { - pline() << p << a; + pline() << p.hostName() << a; } -void QQtWebClient::sslErrors(QNetworkReply *r, QList e) +void QQtWebClient::sslErrors(QNetworkReply* r, QList e) { pline() << r << e; } diff --git a/src/network/qqtwebclient.h b/src/network/qqtwebclient.h index 609e6c33..c5e948b1 100644 --- a/src/network/qqtwebclient.h +++ b/src/network/qqtwebclient.h @@ -4,13 +4,14 @@ #include //import this struct will not build fail #include +#include #include class QQTSHARED_EXPORT QQtWebClient : public QNetworkAccessManager { Q_OBJECT public: - explicit QQtWebClient(QObject *parent = 0); + explicit QQtWebClient(QObject* parent = 0); //void installProtocol(); //void uninstallProtocol(); @@ -20,10 +21,10 @@ signals: public slots: private slots: - void finished(QNetworkReply *reply); - void authenticationRequired(QNetworkReply*,QAuthenticator*); - void proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*); - void sslErrors(QNetworkReply*,QList); + void finished(QNetworkReply* reply); + void authenticationRequired(QNetworkReply*, QAuthenticator*); + void proxyAuthenticationRequired(QNetworkProxy, QAuthenticator*); + void sslErrors(QNetworkReply*, QList); void networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility); void networkSessionConnected(); }; diff --git a/src/qqt.pro b/src/qqt.pro index 570b5303..c4808155 100644 --- a/src/qqt.pro +++ b/src/qqt.pro @@ -21,11 +21,16 @@ equals(QKIT_, macOS) { } CONFIG += debug_and_release CONFIG += build_all -for (cc, CONFIG) { - message($${TARGET} configed $${cc}) -} -for (cc, DEFINES) { - message($${TARGET} defined $${cc}) +greaterThan(QT_MAJOR_VERSION, 4): { + for (cc, CONFIG) { + message($${TARGET} configed $${cc}) + } + for (cc, DEFINES) { + message($${TARGET} defined $${cc}) + } +} else { + message ($${TARGET} configed $${CONFIG}) + message ($${TARGET} defined $${DEFINES}) } ############ ##install diff --git a/src/qqt_header.pri b/src/qqt_header.pri index 26fe70af..ecf0a3b0 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -78,6 +78,8 @@ greaterThan(QT_MAJOR_VERSION, 4): DEFINES += __QT5__ #if you use qextserialport, open the annotation #suggest: Qt5 use factory-packed, Qt4 use forming Qt5, extra use this. #DEFINES += __QEXTSERIALPORT__ +#if compiler QtSerialPort module manual, note this line is a good idea. +lessThan(QT_MAJOR_VERSION, 5): DEFINES += __QEXTSERIALPORT__ contains (DEFINES, __QEXTSERIALPORT__) { #include ( $$PWD/network/qextserialport/qextserialport.pri ) CONFIG += thread @@ -97,6 +99,8 @@ contains (DEFINES, __QEXTSERIALPORT__) { DEFINES += __CUSTOMPLOT__ #if you use qtbluetooth, open this annotation DEFINES += __BLUETOOTH__ +#if compiler QtBluetooth module manual, note this line is a good idea. +lessThan(QT_MAJOR_VERSION, 5): DEFINES -= __BLUETOOTH__ contains (DEFINES, __BLUETOOTH__) { greaterThan(QT_MAJOR_VERSION, 4): QT += bluetooth lessThan(QT_MAJOR_VERSION, 5): CONFIG += bluetooth