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

on android add printsupport and update library macro for many module

Browse Source
This commit is contained in:
tianduanrui 2017-11-12 21:04:23 +08:00
parent d122158107
commit 570f59cd92
16 changed files with 3323 additions and 3173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ moc_*.cpp
qrc_*.cpp
Makefile
*-build-*
.idea

44
QQt.pro
View File

@ -2,39 +2,51 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = src/qqt.pro
#open SUBDIRS += examples/framelesshelperwidget
#open SUBDIRS += examples/qqtframe
#open SUBDIRS += examples/animationframe
#open SUBDIRS += examples/cmdwidget
#open
SUBDIRS += examples/qqtnetworkexample
#open SUBDIRS += examples/exquisite
#open SUBDIRS += examples/QtBuildTool
#open SUBDIRS += examples/QtSdkManager
#open SUBDIRS += examples/QQtInstaller
#open SUBDIRS += examples/qqtframe2
#-----------------------------------------------------------------
#basic example
#-----------------------------------------------------------------
#SUBDIRS += examples/framelesshelperwidget
#SUBDIRS += examples/qqtframe
#SUBDIRS += examples/animationframe
#SUBDIRS += examples/cmdwidget
#SUBDIRS += examples/qqtnetworkexample
#
SUBDIRS += examples/exquisite
#SUBDIRS += examples/QtBuildTool
#SUBDIRS += examples/QtSdkManager
#SUBDIRS += examples/QQtInstaller
#SUBDIRS += examples/qqtframe2
#-----------------------------------------------------------------
#need QQt installed to Qt library or
#need QQt installed to sdk
#open SUBDIRS += examples/qqtframe3
#-----------------------------------------------------------------
#SUBDIRS += examples/qqtframe3
#SUBDIRS += examples/VegeTablesPrice
#-----------------------------------------------------------------
#need vlcQt libvlc library
#-----------------------------------------------------------------
#SUBDIRS += examples/qqtliveplayer
#-----------------------------------------------------------------
#need ffmpeg library
#-----------------------------------------------------------------
#SUBDIRS += examples/qqtffmpegplayer
#need bluetooth library
#SUBDIRS += examples/qqtbluetoothfiletransferserver
#open SUBDIRS += examples/qqtbluetoothfiletransferserver
#-----------------------------------------------------------------
#need QtSoap - WebSupport
#open SUBDIRS += examples/easter
#open SUBDIRS += examples/soapQQtOnline
#-----------------------------------------------------------------
#SUBDIRS += examples/easter
#SUBDIRS += examples/soapQQtOnline
#-----------------------------------------------------------------
#need webkitwidgets - WebSupport
#webkit webengine
#-----------------------------------------------------------------
#SUBDIRS += examples/qqtftpclient
#SUBDIRS += examples/qqthttpclient
#SUBDIRS += examples/qqtwebkit

61
examples/exquisite/exquisite.pro
View File

@ -3,24 +3,6 @@
# Project created by QtCreator 2017-10-20T19:53:30
#
#-------------------------------------------------
include(../qqtframe2/link_qqt_library.pri)
############
##install
############
#CONFIG += can_install
can_install:equals(QKIT_PRIVATE, EMBEDDED) {
target.path = /Application
INSTALLS += target
} else: unix {
equals(QKIT_PRIVATE, macOS) {
target.path = /Applications
INSTALLS += target
}
}
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@ -55,3 +37,46 @@ HEADERS += \
FORMS += \
mainwindow.ui
#-------------------------------------------------
#link qqt library
#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g.
#-------------------------------------------------
include(../qqtframe2/link_qqt_library.pri)
#-------------------------------------------------
#install
#-------------------------------------------------
#CONFIG += can_install
can_install:equals(QKIT_PRIVATE, EMBEDDED) {
target.path = /Application
INSTALLS += target
} else: unix {
equals(QKIT_PRIVATE, macOS) {
target.path = /Applications
INSTALLS += target
}
}
#-------------------------------------------------
##project environ
#-------------------------------------------------
#default
message ($${TARGET} config $${CONFIG})
message ($${TARGET} define $${DEFINES})
contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) {
CONFIG += mobility
MOBILITY =
DISTFILES += \
android/AndroidManifest.xml \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradlew \
android/res/values/libs.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew.bat
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
}

21
examples/exquisite/mainwindow.cpp
View File

@ -4,6 +4,11 @@
#include <QKeyEvent>
#include <qqtcore.h>
#include <qqtslideeffecttabbar.h>
#include <qcustomplot.h>
#include <QTime>
QCPGraph* g0 = NULL;
QTime start;
MainWindow::MainWindow(QWidget* parent) :
QMainWindow(parent),
@ -201,6 +206,15 @@ MainWindow::MainWindow(QWidget* parent) :
ui->w77->addTab("ddd");
ui->w77->addTab("xxxx");
ui->w77->setFixedHeight(28);
ui->w99->xAxis->setTickLabelType(QCPAxis::ltNumber);
ui->w99->xAxis->setAutoTickStep(true);
ui->w99->xAxis->setTickStep(5);
ui->w99->xAxis->setRange(0, 100);
ui->w99->yAxis->setRange(0, 200);
g0 = ui->w99->addGraph(ui->w99->xAxis, ui->w99->yAxis);
start = QTime::currentTime();
}
@ -212,6 +226,13 @@ MainWindow::~MainWindow()
void MainWindow::setValue(int value)
{
this->value = value;
QTime ecl = QTime::currentTime();
int key = -ecl.msecsTo(start) / 10;
g0->addData(key, ui->hs0->value());
ui->w99->xAxis->setRange(0, key + 100, Qt::AlignLeft);
ui->w99->replot();
//pline() << key;
}
void MainWindow::setValue()

20
examples/exquisite/mainwindow.ui
View File

@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>5</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -113,6 +113,16 @@
<attribute name="title">
<string>页</string>
</attribute>
<widget class="QCustomPlot" name="w99" native="true">
<property name="geometry">
<rect>
<x>140</x>
<y>80</y>
<width>651</width>
<height>301</height>
</rect>
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_6">
<attribute name="title">
@ -233,7 +243,13 @@
<customwidget>
<class>QQtSlideEffectTabWidget</class>
<extends>QTabWidget</extends>
<header>qqtslideeffecttabwidget.h</header>
<header location="global">qqtslideeffecttabwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QCustomPlot</class>
<extends>QWidget</extends>
<header location="global">qcustomplot.h</header>
<container>1</container>
</customwidget>
</customwidgets>

2
examples/qqtbluetoothfiletransferserver/filetransferprotocol.cpp
View File

@ -1,6 +1,6 @@
#include "filetransferprotocol.h"
FiletransferProtocol::FiletransferProtocol(QObject *parent) : QQTProtocol(parent)
FiletransferProtocol::FiletransferProtocol(QObject* parent) : QQtProtocol(parent)
{
}

6
examples/qqtbluetoothfiletransferserver/filetransferprotocol.h
View File

@ -5,11 +5,11 @@
#include <qqtmessage.h>
#include <qqtprotocol.h>
class FiletransferMessage:public QQTMessage
class FiletransferMessage: public QQtMessage
{
Q_OBJECT
public:
explicit FiletransferMessage(QObject* parent = 0):QQTMessage(parent) {}
explicit FiletransferMessage(QObject* parent = 0): QQtMessage(parent) {}
// QQTMessage interface
@ -26,7 +26,7 @@ private:
quint32 tail;
};
class FiletransferProtocol : public QQTProtocol
class FiletransferProtocol : public QQtProtocol
{
Q_OBJECT
public:

33
examples/qqtbluetoothfiletransferserver/qqtbluetoothfiletransferserver.pro
View File

@ -3,8 +3,6 @@
# Project created by QtCreator 2017-10-17T17:48:58
#
#-------------------------------------------------
include(../qqtframe2/link_qqt_library.pri)
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@ -41,3 +39,34 @@ FORMS += \
CONFIG += mobility
MOBILITY =
#-------------------------------------------------
#link qqt library
#-------------------------------------------------
include(../qqtframe2/link_qqt_library.pri)
#-------------------------------------------------
#install
#-------------------------------------------------
#CONFIG += can_install
can_install:equals(QKIT_PRIVATE, EMBEDDED) {
target.path = /Application
INSTALLS += target
} else: unix {
equals(QKIT_PRIVATE, macOS) {
target.path = /Applications
INSTALLS += target
}
}
equals(QKIT_PRIVATE, ANDROID) {
CONFIG += mobility
MOBILITY =
}
#-------------------------------------------------
##project environ
#-------------------------------------------------
#default
message ($${TARGET} config $${CONFIG})
message ($${TARGET} define $${DEFINES})

7
src/customplot/qcustomplot.h
View File

@ -79,6 +79,9 @@ class QCPBars;
// decl definitions for shared library compilation/usage:
#include <QtCore/qglobal.h>
#if defined(Q_OS_WIN)
//dynamic and static are different
#if defined(QCUSTOMPLOT_COMPILE_LIBRARY)
# define QCP_LIB_DECL Q_DECL_EXPORT
#elif defined(QCUSTOMPLOT_USE_LIBRARY)
@ -86,6 +89,10 @@ class QCPBars;
#else
# define QCP_LIB_DECL
#endif
#else
//dynamic and static are equal to each other
# define QCP_LIB_DECL
#endif
/*!
The QCP Namespace contains general enums and QFlags used throughout the QCustomPlot library

1
src/exquisite/qqtcustomverificationcode.cpp
View File

@ -10,6 +10,7 @@
#include <QDebug>
#include <QEventLoop>
#include <QTimer>
#include <qqt.h>
/**
* @brief The QQtVerificationCode_p class 验证码操作类

19
src/pluginwatcher/qdevicewatcher.h
View File

@ -22,18 +22,21 @@
#include <QtCore/QObject>
#include <QtCore/QEvent>
#include <QtCore/qglobal.h>
#ifdef BUILD_QDEVICEWATCHER_STATIC
#if defined(Q_OS_WIN)
//dynamic and static are different
#if defined(BUILD_QDEVICEWATCHER_LIB)
# define Q_DW_EXPORT Q_DECL_EXPORT
#elif defined(BUILD_QDEVICEWATCHER_STATIC)
# define Q_DW_EXPORT
#else
#if defined(BUILD_QDEVICEWATCHER_LIB)
# undef Q_DW_EXPORT
# define Q_DW_EXPORT Q_DECL_EXPORT
#else
# undef Q_DW_EXPORT
# define Q_DW_EXPORT //Q_DECL_IMPORT //only for vc?
# define Q_DW_EXPORT Q_DECL_IMPORT
#endif
#else
//dynamic and static are equal to each other
# define Q_DW_EXPORT
#endif
#endif //BUILD_QDEVICEWATCHER_STATIC
class QDeviceWatcherPrivate;

33
src/qqt.pro
View File

@ -7,6 +7,11 @@
#if you succeed with LibQQt, please thumb up.
#2017年11月10日18:53:56
#################################################################
##Usage
#################################################################
#please dont use Qt 5.9.1, it is broken with android and ios.
#################################################################
##project name
#################################################################
@ -18,13 +23,15 @@ TEMPLATE = lib
##need QKIT to compitible with some occasion
################################################
include ($$PWD/qqt_kit.pri)
##special lib lib_bundle/staticlib
equals(QKIT_PRIVATE, macOS) {
CONFIG += dll
CONFIG += lib_bundle
} else:equals(QKIT_PRIVATE, iOS) {
CONFIG += staticlib
} else:equals(QKIT_PRIVATE, WIN32) {
##different target:
##win link qqt dll + ..
##win link qqt static + QQT_STATIC_LIBRARY
##win build qqt dll + QQT_LIBRARY
##win build qqt lib + QQT_STATIC_LIBRARY
##*nix build and link qqt dll or lib + ..
##some target, special lib lib_bundle/staticlib
equals(QKIT_PRIVATE, WIN32) {
#when Qt is static by mingw32 building 5.9.1
equals(QT_VERSION, 5.9.1){
CONFIG += staticlib
@ -33,12 +40,16 @@ equals(QKIT_PRIVATE, macOS) {
CONFIG += dll
DEFINES += QQT_LIBRARY
}
} else {
##default build dll but some occasion
} else:equals(QKIT_PRIVATE, macOS) {
CONFIG += dll
CONFIG += lib_bundle
} else:equals(QKIT_PRIVATE, iOS) {
CONFIG += staticlib
} else {
##default build dll
CONFIG += dll
#windows QQt library export (DLL) static lib is not needed
#*nix no need this macro
DEFINES += QQT_LIBRARY
#DEFINES += QQT_LIBRARY
}
#create prl
CONFIG += create_prl

14
src/qqt_header.pri
View File

@ -121,17 +121,21 @@ contains (DEFINES, __CPP11__) {
##################PrintSupport Module###############################
#if you use printsupport , open this annotation
DEFINES += __PRINTSUPPORT__
#ios android can't support this function now
contains(QKIT_PRIVATE, iOS||iOSSimulator||ANDROID||ANDROIDX86) {
#ios can't support this feature
contains(QKIT_PRIVATE, iOS||iOSSimulator) {
#DEFINES -= __PRINTSUPPORT__
qtHaveModule(printsupport) : message(ios have printsupport)
}
#Qt5.9.1, ios android can't support this feature
equals(QT_VERSION, 5.9.1) {
contains(QKIT_PRIVATE, ANDROID||ANDROIDX86) {
DEFINES -= __PRINTSUPPORT__
}
}
contains (DEFINES, __PRINTSUPPORT__) {
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
#if you use qcustomplot, open this annotation
DEFINES += __CUSTOMPLOT__
contains(QKIT_PRIVATE, iOS||iOSSimulator||ANDROID||ANDROIDX86) {
DEFINES -= __CUSTOMPLOT__
}
}
##################Exquisite Module###############################

3
src/qqt_library.pri
View File

@ -84,7 +84,8 @@ equals(QKIT_PRIVATE, macOS) {
equals(QKIT_PRIVATE, macOS) {
CONFIG += app_bundle
}
equals(QKIT_PRIVATE, ANDROID) {
equals(QKIT_PRIVATE, ANDROID||ANDROIDX86) {
CONFIG += mobility
MOBILITY =
}

30
src/qqt_source.pri
View File

@ -16,20 +16,20 @@ SOURCES +=
HEADERS +=
#root dir
win32 {
contains (QKIT_PRIVATE, WIN32||WIN64) {
#win32 base type
HEADERS += $$PWD/qqtwin.h
}
unix {
equals(QKIT_PRIVATE, macOS) {
} else:contains (QKIT_PRIVATE, macOS||iOS||iOSSimulator) {
#mac base type
HEADERS += $$PWD/qqtdarwin.h
} else: contains(QKIT_PRIVATE, LINUX|LINUX64) {
} else:contains (QKIT_PRIVATE, ANDROID||ANDROIDX86) {
#android base type
HEADERS += $$PWD/qqtandroid.h
} else {
#linux base type
HEADERS += $$PWD/qqtlinux.h
}
}
contains (QKIT_PRIVATE, ANDROID||ANDROIDX86) {
HEADERS += $$PWD/qqtandroid.h
}
HEADERS += $$PWD/qqt.h \
$$PWD/qqt-local.h \
$$PWD/qqtversion.h \
@ -131,10 +131,12 @@ HEADERS += $$PWD/multimedia/qqtmplayer.h
#pluginwatcher
#TODO: macOS dump
win32 {
contains (DEFINES, QQT_LIBRARY) {
DEFINES += BUILD_QDEVICEWATCHER_LIB
} else: contains (DEFINES, QQT_STATIC_LIBRARY) {
DEFINES += BUILD_QDEVICEWATCHER_STATIC
}
win32 {
wince*: SOURCES += $$PWD/pluginwatcher/qdevicewatcher_wince.cpp
else: SOURCES += $$PWD/pluginwatcher/qdevicewatcher_win32.cpp
}
@ -166,8 +168,12 @@ contains (DEFINES, __PRINTSUPPORT__) {
#DEFINES += __CUSTOMPLOT__
contains (DEFINES, __CUSTOMPLOT__) {
#message (qcustomplot is used in $${TARGET})
win32 {
contains (DEFINES, QQT_LIBRARY) {
DEFINES += QCUSTOMPLOT_COMPILE_LIBRARY
} else: contains (DEFINES, QQT_STATIC_LIBRARY) {
DEFINES += QCUSTOMPLOT_USE_LIBRARY
}
}
SOURCES += $$PWD/customplot/qcpdocumentobject.cpp \
$$PWD/customplot/qcustomplot.cpp
@ -367,8 +373,12 @@ contains (DEFINES, __QRENCODE__) {
##websocket
contains(DEFINES, __QTSOAP__) {
win32 {
contains (DEFINES, QQT_LIBRARY) {
DEFINES += QT_QTSOAP_LIBRARY
} else: contains (DEFINES, QQT_STATIC_LIBRARY) {
DEFINES += QT_QTSOAP_STATIC_LIBRARY
}
}
SOURCES += \
$$PWD/soap/qtsoap.cpp

9
src/soap/qtsoap.h
View File

@ -49,12 +49,21 @@
#include <QLinkedList>
#include <QPointer>
#include <QtCore/qglobal.h>
#if defined(Q_OS_WIN)
//dynamic and static are different
#if defined(QT_QTSOAP_LIBRARY)
# define QT_QTSOAP_EXPORT Q_DECL_EXPORT
#elif defined(QT_QTSOAP_STATIC_LIBRARY)
# define QT_QTSOAP_EXPORT
#else
# define QT_QTSOAP_EXPORT Q_DECL_IMPORT
#endif
#else
//dynamic and static are equal to each other
# define QT_QTSOAP_EXPORT
#endif
#define SOAPv11_ENVELOPE "http://schemas.xmlsoap.org/soap/envelope/"
#define SOAPv11_ENCODING "http://schemas.xmlsoap.org/soap/encoding/"