diff --git a/QQt.pro b/QQt.pro index fec80a1c..784739d6 100644 --- a/QQt.pro +++ b/QQt.pro @@ -4,7 +4,6 @@ CONFIG += ordered SUBDIRS = src/qqt.pro #open SUBDIRS += examples/framelesshelperwidget #open SUBDIRS += examples/qqtframe -#open SUBDIRS += examples/qqtframe2 #open SUBDIRS += examples/animationframe #open SUBDIRS += examples/cmdwidget #open SUBDIRS += examples/qqtnetworkexample @@ -13,9 +12,11 @@ SUBDIRS += examples/exquisite #open SUBDIRS += examples/QtSdkManager #open SUBDIRS += examples/QQtInstaller +#open SUBDIRS += examples/qqtframe2 + #need QQt installed to Qt library or #need QQt installed to sdk -#open SUBDIRS += examples/qqtframe3 +#openSUBDIRS += examples/qqtframe3 #SUBDIRS += examples/VegeTablesPrice #need vlcQt libvlc library diff --git a/examples/exquisite/exquisite.pro b/examples/exquisite/exquisite.pro index df025696..6f5d665e 100644 --- a/examples/exquisite/exquisite.pro +++ b/examples/exquisite/exquisite.pro @@ -19,8 +19,11 @@ contains (CONFIG, BUILD_SRC) { #if you want to build src but not link QQt in this project include($${QQT_SOURCE_ROOT}/src/qqt_source.pri) } else { - #if you want to link QQt library - include($${QQT_SOURCE_ROOT}/src/qqt_library.pri) + contains(QKIT_PRIVATE, WIN32|WIN64) { + } else { + #if you want to link QQt library + include($${QQT_SOURCE_ROOT}/src/qqt_library.pri) + } } ############ diff --git a/src/exquisite/qqtslideeffecttabbar.h b/src/exquisite/qqtslideeffecttabbar.h index 1b1d980d..23ac4447 100644 --- a/src/exquisite/qqtslideeffecttabbar.h +++ b/src/exquisite/qqtslideeffecttabbar.h @@ -9,6 +9,7 @@ #include #include #include +#include class QQtSlideEffectTabBar : public QTabBar { diff --git a/src/network/qqtclient.h b/src/network/qqtclient.h index 4a4bf664..ac74b701 100644 --- a/src/network/qqtclient.h +++ b/src/network/qqtclient.h @@ -9,6 +9,7 @@ #include "QStringList" #include "qqtprotocol.h" #include "qqt-local.h" +#include "qqtcore.h" #define QQT_TCP_SOCKET 0 #define QQT_SOCKET 1 @@ -23,7 +24,7 @@ class QQTSHARED_EXPORT QQTClient : public QTcpSocket { Q_OBJECT public: - explicit QQTClient(QObject *parent = 0); + explicit QQTClient(QObject* parent = 0); virtual ~QQTClient(); void SetServerIPAddress(QStringList ip) { m_serverIP = ip; } diff --git a/src/qqt_library.pri b/src/qqt_library.pri index b16b8c20..50bdccd9 100644 --- a/src/qqt_library.pri +++ b/src/qqt_library.pri @@ -11,7 +11,9 @@ message(Link QQt to $${TARGET} $${QKIT_PRIVATE} \ at $${QT_VERSION} $${SYSNAME} $${BUILD} \ on $${QMAKE_HOST.os}) -QQT_LIB_PWD = $$PWD/../sdk/lib +isEmpty(QQT_LIB_PWD) { + QQT_LIB_PWD = $$PWD/../sdk/lib +} message (Link QQt from: $$QQT_LIB_PWD) contains(DEFINES, __DARWIN__) { diff --git a/src/qqt_source.pri b/src/qqt_source.pri index 2eab9923..b613199f 100644 --- a/src/qqt_source.pri +++ b/src/qqt_source.pri @@ -6,7 +6,7 @@ #------------------------------------------------- #QQt source #Don't modify this pri -#FDL1.3 GPLv3 LGPLv2.1 PreviewCommercial +#FDLv1.3 GPLv3 LGPLv2.1 PreviewCommercial #2017年10月29日09:16:41 #------------------------------------------------- SOURCES +=