From d67a9f1e8a6eab110d2b7f49b605c1a6c7e1e0c7 Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Mon, 12 Nov 2018 00:44:24 +0800 Subject: [PATCH] update --- doxygen/html/qextserialenumerator_8h_source.html | 2 +- doxygen/html/qextserialport_8h_source.html | 2 +- doxygen/html/qqt-qt_8h_source.html | 4 ++-- src/network/qextserialport/qextserialenumerator.h | 2 +- src/network/qextserialport/qextserialport.h | 2 +- src/qqt_header.pri | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doxygen/html/qextserialenumerator_8h_source.html b/doxygen/html/qextserialenumerator_8h_source.html index a16f6dfd..64a24562 100644 --- a/doxygen/html/qextserialenumerator_8h_source.html +++ b/doxygen/html/qextserialenumerator_8h_source.html @@ -72,7 +72,7 @@ $(function() {
qextserialenumerator.h
-Go to the documentation of this file.
1 
7 #ifndef _QEXTSERIALENUMERATOR_H_
8 #define _QEXTSERIALENUMERATOR_H_
9 
10 
11 #include <QString>
12 #include <QList>
13 
14 #ifdef _TTY_WIN_
15 #include <windows.h>
16 #include <setupapi.h>
17 #endif /*_TTY_WIN_*/
18 
19 
23 struct QextPortInfo
24 {
25  QString portName;
26  QString physName;
27  QString friendName;
28  QString enumName;
29 };
30 
31 
38 class LIBRARY_SHARED_EXPORT QextSerialEnumerator
39 {
40 private:
41 #ifdef _TTY_WIN_
42 
48  static QString getRegKeyValue ( HKEY key, LPCTSTR property );
49 
59  static QString getDeviceProperty ( HDEVINFO devInfo, PSP_DEVINFO_DATA devData, DWORD property );
60 
65  static void setupAPIScan ( QList<QextPortInfo>& infoList );
66 #endif /*_TTY_WIN_*/
67 
68 public:
73  static QList<QextPortInfo> getPorts();
74 };
75 
76 #endif /*_QEXTSERIALENUMERATOR_H_*/
QextPortInfo
Definition: qextserialenumerator.h:23
+Go to the documentation of this file.
1 
7 #ifndef _QEXTSERIALENUMERATOR_H_
8 #define _QEXTSERIALENUMERATOR_H_
9 
10 
11 #include <QString>
12 #include <QList>
13 
14 #ifdef _TTY_WIN_
15 #include <windows.h>
16 #include <setupapi.h>
17 #endif /*_TTY_WIN_*/
18 
19 
23 struct QextPortInfo
24 {
25  QString portName;
26  QString physName;
27  QString friendName;
28  QString enumName;
29 };
30 
31 
38 class LIBRARYSHARED_EXPORT QextSerialEnumerator
39 {
40 private:
41 #ifdef _TTY_WIN_
42 
48  static QString getRegKeyValue ( HKEY key, LPCTSTR property );
49 
59  static QString getDeviceProperty ( HDEVINFO devInfo, PSP_DEVINFO_DATA devData, DWORD property );
60 
65  static void setupAPIScan ( QList<QextPortInfo>& infoList );
66 #endif /*_TTY_WIN_*/
67 
68 public:
73  static QList<QextPortInfo> getPorts();
74 };
75 
76 #endif /*_QEXTSERIALENUMERATOR_H_*/
QextPortInfo
Definition: qextserialenumerator.h:23
QextPortInfo::friendName
QString friendName
Friendly name.
Definition: qextserialenumerator.h:27
QextPortInfo::portName
QString portName
Port name.
Definition: qextserialenumerator.h:25
QextPortInfo::physName
QString physName
Physical name.
Definition: qextserialenumerator.h:26
diff --git a/doxygen/html/qextserialport_8h_source.html b/doxygen/html/qextserialport_8h_source.html index ef4b69d0..e82cc689 100644 --- a/doxygen/html/qextserialport_8h_source.html +++ b/doxygen/html/qextserialport_8h_source.html @@ -72,7 +72,7 @@ $(function() {
qextserialport.h
-
1 
2 #ifndef _QEXTSERIALPORT_H_
3 #define _QEXTSERIALPORT_H_
4 
5 /*POSIX CODE*/
6 #ifdef _TTY_POSIX_
7 #include "posix_qextserialport.h"
8 #define QextBaseType Posix_QextSerialPort
9 
10 /*MS WINDOWS CODE*/
11 #else
12 #include "win_qextserialport.h"
13 #define QextBaseType Win_QextSerialPort
14 #endif
15 
16 class LIBRARY_SHARED_EXPORT QextSerialPort: public QextBaseType
17 {
18  Q_OBJECT
19 
20 public:
21  typedef QextSerialBase::QueryMode QueryMode;
22 
23  QextSerialPort();
24  QextSerialPort ( const QString& name, QueryMode mode = QextSerialPort::Polling );
25  QextSerialPort ( PortSettings const& s, QueryMode mode = QextSerialPort::Polling );
26  QextSerialPort ( const QString& name, PortSettings const& s, QueryMode mode = QextSerialPort::Polling );
27  QextSerialPort ( const QextSerialPort& s );
28  QextSerialPort& operator= ( const QextSerialPort& );
29  virtual ~QextSerialPort();
30 
31 };
32 
33 #endif
QextSerialPort
Definition: qextserialport.h:16
+
1 
2 #ifndef _QEXTSERIALPORT_H_
3 #define _QEXTSERIALPORT_H_
4 
5 /*POSIX CODE*/
6 #ifdef _TTY_POSIX_
7 #include "posix_qextserialport.h"
8 #define QextBaseType Posix_QextSerialPort
9 
10 /*MS WINDOWS CODE*/
11 #else
12 #include "win_qextserialport.h"
13 #define QextBaseType Win_QextSerialPort
14 #endif
15 
16 class LIBRARYSHARED_EXPORT QextSerialPort: public QextBaseType
17 {
18  Q_OBJECT
19 
20 public:
21  typedef QextSerialBase::QueryMode QueryMode;
22 
23  QextSerialPort();
24  QextSerialPort ( const QString& name, QueryMode mode = QextSerialPort::Polling );
25  QextSerialPort ( PortSettings const& s, QueryMode mode = QextSerialPort::Polling );
26  QextSerialPort ( const QString& name, PortSettings const& s, QueryMode mode = QextSerialPort::Polling );
27  QextSerialPort ( const QextSerialPort& s );
28  QextSerialPort& operator= ( const QextSerialPort& );
29  virtual ~QextSerialPort();
30 
31 };
32 
33 #endif
QextSerialPort
Definition: qextserialport.h:16
PortSettings
Definition: qextserialbase.h:132
diff --git a/doxygen/html/qqt-qt_8h_source.html b/doxygen/html/qqt-qt_8h_source.html index 7e0c98c9..2ce0247e 100644 --- a/doxygen/html/qqt-qt_8h_source.html +++ b/doxygen/html/qqt-qt_8h_source.html @@ -1,4 +1,4 @@ - + @@ -72,7 +72,7 @@ $(function() {
qqt-qt.h
-
1 #ifndef QQTGUIQT_H
2 #define QQTGUIQT_H
3 
4 #include <qglobal.h>
5 
6 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
7 #include <QtCore>
8 #include <QtGui>
9 #else
10 #include <QtCore>
11 #include <QtGui>
12 #include <QtWidgets>
13 #include <QtGlobal>
14 #endif
15 
16 //来自qqt_qkit.pri
17 #if defined __EMBEDDED_LINUX__
18 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
19 #include <QWSInputMethod>
20 #include <QWSServer>
21 #include <QMouseDriverFactory>
22 #endif
23 #endif
24 
25 #include <QApplication>
26 #include <QTranslator>
27 #include <QDebug>
28 
29 #include <QSslError>
30 #include <QSslKey>
31 #include <QSslSocket>
32 
33 #include <QPixmap>
34 #include <QImage>
35 #include <QMovie>
36 #include <QTime>
37 #include <QThread>
38 #include <QTimer>
39 #include <QSettings>
40 #include <QQueue>
41 #include <QMutex>
42 #include <QList>
43 #include <QSemaphore>
44 #include <QStylePainter>
45 #include <QMouseEvent>
46 #include <QUuid>
47 
48 //来自qqt_header.pri
49 #ifdef __PRINTSUPPORT__
50 #include <QPrinter>
51 #endif
52 
53 #include <QTextFormat>
54 #include <QTextTable>
55 #include <QTextEdit>
56 #include <QTextBrowser>
57 #include <QTextCodec>
58 #include <QFont>
59 
60 #include <QFileInfo>
61 #include <QFile>
62 #include <QDir>
63 
64 #include <QMessageBox>
65 #include <QSplashScreen>
66 #include <QWidget>
67 #include <QDesktopWidget>
68 #include <QHBoxLayout>
69 #include <QVBoxLayout>
70 #include <QMainWindow>
71 #include <QStackedWidget>
72 #include <QLabel>
73 #include <QLayout>
74 
75 #include <QTableView>
76 #include <QItemSelectionModel>
77 #include <QItemDelegate>
78 #include <QSqlRelationalDelegate>
79 #include <QSqlTableModel>
80 #include <QSqlDatabase>
81 #include <QSqlQuery>
82 #include <QSqlRecord>
83 #include <QSqlError>
84 
85 #include <QAnimationGroup>
86 #include <QPauseAnimation>
87 #include <QVariantAnimation>
88 #include <QParallelAnimationGroup>
89 #include <QSequentialAnimationGroup>
90 #include <QPropertyAnimation>
91 
92 #include <QState>
93 #include <QStateMachine>
94 #include <QSignalTransition>
95 #include <QEventTransition>
96 #include <QTimeLine>
97 
98 //来自qqt_header.pri
99 #ifdef __PROCESSMODULE__
100 #include <QProcess>
101 #endif
102 
103 #endif // QQTGUIQT_H
+
1 #ifndef QQTGUIQT_H
2 #define QQTGUIQT_H
3 
4 #include <qglobal.h>
5 
6 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
7 #include <QtCore>
8 #include <QtGui>
9 #else
10 #include <QtCore>
11 #include <QtGui>
12 #include <QtWidgets>
13 #include <QtGlobal>
14 #endif
15 
16 //来自qqt_qkit.pri
17 #if defined __EMBEDDED_LINUX__
18 #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
19 #include <QWSInputMethod>
20 #include <QWSServer>
21 #include <QMouseDriverFactory>
22 #endif
23 #endif
24 
25 #include <QApplication>
26 #include <QTranslator>
27 #include <QDebug>
28 
29 #include <QSslError>
30 #include <QSslKey>
31 #include <QSslSocket>
32 
33 #include <QPixmap>
34 #include <QImage>
35 #include <QMovie>
36 #include <QTime>
37 #include <QThread>
38 #include <QTimer>
39 #include <QSettings>
40 #include <QQueue>
41 #include <QMutex>
42 #include <QList>
43 #include <QSemaphore>
44 #include <QStylePainter>
45 #include <QMouseEvent>
46 #include <QUuid>
47 
48 //来自qqt_header.pri
49 #ifdef __PRINTSUPPORT__
50 #include <QPrinter>
51 #endif
52 
53 #include <QTextFormat>
54 #include <QTextTable>
55 #include <QTextEdit>
56 #include <QTextBrowser>
57 #include <QTextCodec>
58 #include <QFont>
59 
60 #include <QFileInfo>
61 #include <QFile>
62 #include <QDir>
63 
64 #include <QMessageBox>
65 #include <QSplashScreen>
66 #include <QWidget>
67 #include <QDesktopWidget>
68 #include <QHBoxLayout>
69 #include <QVBoxLayout>
70 #include <QMainWindow>
71 #include <QStackedWidget>
72 #include <QLabel>
73 #include <QLayout>
74 
75 #include <QTableView>
76 #include <QItemSelectionModel>
77 #include <QItemDelegate>
78 #include <QSqlRelationalDelegate>
79 #include <QSqlTableModel>
80 #include <QSqlDatabase>
81 #include <QSqlQuery>
82 #include <QSqlRecord>
83 #include <QSqlError>
84 
85 #include <QAnimationGroup>
86 #include <QPauseAnimation>
87 #include <QVariantAnimation>
88 #include <QParallelAnimationGroup>
89 #include <QSequentialAnimationGroup>
90 #include <QPropertyAnimation>
91 
92 #include <QState>
93 #include <QStateMachine>
94 #include <QSignalTransition>
95 #include <QEventTransition>
96 #include <QTimeLine>
97 
98 //来自qqt_header.pri
99 #ifdef __PROCESSSUPPORT__
100 #include <QProcess>
101 #endif
102 
103 #endif // QQTGUIQT_H
Generated by   diff --git a/src/network/qextserialport/qextserialenumerator.h b/src/network/qextserialport/qextserialenumerator.h index f3c127e4..1bdac8b3 100644 --- a/src/network/qextserialport/qextserialenumerator.h +++ b/src/network/qextserialport/qextserialenumerator.h @@ -35,7 +35,7 @@ struct QextPortInfo * Windows implementation is based on Zach Gorman's work from * The Code Project (http://www.codeproject.com/system/setupdi.asp). */ -class LIBRARY_SHARED_EXPORT QextSerialEnumerator +class LIBRARYSHARED_EXPORT QextSerialEnumerator { private: #ifdef _TTY_WIN_ diff --git a/src/network/qextserialport/qextserialport.h b/src/network/qextserialport/qextserialport.h index ebe50cbb..951b5fac 100644 --- a/src/network/qextserialport/qextserialport.h +++ b/src/network/qextserialport/qextserialport.h @@ -13,7 +13,7 @@ #define QextBaseType Win_QextSerialPort #endif -class LIBRARY_SHARED_EXPORT QextSerialPort: public QextBaseType +class LIBRARYSHARED_EXPORT QextSerialPort: public QextBaseType { Q_OBJECT diff --git a/src/qqt_header.pri b/src/qqt_header.pri index 5c0879ea..c7a3120f 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -222,13 +222,13 @@ defineTest(add_defines_QQt){ contains (DEFINES, __NETWORKSUPPORT__) { ##################SerialPort Module################################## #if you use qextserialport, open the annotation - #suggest: Qt5 use factory-packed, Qt4 use forming Qt5, extra use this. + #suggest: Qt5 using factory-packed, Qt4 using from Qt5, extra using this. #DEFINES += __QEXTSERIALPORT__ #if compiler QtSerialPort module manual, note this line is a good idea. default: qt4 qextserialport lessThan(QT_MAJOR_VERSION, 5): DEFINES += __QEXTSERIALPORT__ #to ios, use qextserialport - #android qt5 support serialport default? contains (DEFINES, __IOS__): DEFINES += __QEXTSERIALPORT__ + #android qt5 has QtSerialport? contains (DEFINES, __QEXTSERIALPORT__) { CONFIG += thread unix:DEFINES += _TTY_POSIX_ @@ -238,8 +238,8 @@ defineTest(add_defines_QQt){ #message ( __QEXTSERIALPORT__ Defined in $${TARGET}) } else { #message ( __QSERIALPORT__ Defined in $${TARGET}) - greaterThan(QT_MAJOR_VERSION, 4): QT += serialport lessThan(QT_MAJOR_VERSION, 5): CONFIG += serialport + else:QT += serialport unix { DEFINES += _TTY_POSIX_ } else {