diff --git a/a0-qqtfoundation.pro b/QQt.pro similarity index 100% rename from a0-qqtfoundation.pro rename to QQt.pro diff --git a/examples/qqt_library.pri b/examples/qqt_library.pri index e0a4a06a..3140a36e 100644 --- a/examples/qqt_library.pri +++ b/examples/qqt_library.pri @@ -1,20 +1,17 @@ #here is all your app common defination and configration #change these path on your computer message(Link QQt to $${TARGET} $${QKIT_} at $${QT_VERSION} $${SYSNAME} $${BUILD} on $${QMAKE_HOST.os}) +QQT_OUT_PWD=$$OUT_PWD/../../src/bin +message (QQt is build here: $$QQT_OUT_PWD) +LIBS += -L$$QQT_OUT_PWD equals(QMAKE_HOST.os, Darwin) { - LIBS += -F/Users/abel/Develop/c0-buildstation/a0-qqtfoundation/$${QT_VERSION}/$${SYSNAME}/$${BUILD}/src/bin - contains(DEFINES, __DARWIN__) { - LIBS += -framework QQt - } else: contains(DEFINES, __IOS__) { + contains(DEFINES, __DARWIN__|__IOS__) { + LIBS += -F$$QQT_OUT_PWD LIBS += -framework QQt } else{ LIBS += -lQQt } -} else: equals(QMAKE_HOST.os, Linux) { - LIBS += -L/home/abel/Develop/c0-buildstation/a0-qqtfoundation/$${QT_VERSION}/$${SYSNAME}/$${BUILD}/src/bin - LIBS += -lQQt -} else: equals(QMAKE_HOST.os, Windows) { - LIBS += -LC:/Users/Administrator/Develop/c0-build/a0-qqtfoundation/$${QT_VERSION}/$${SYSNAME}/$${BUILD}/src/bin +} else: equals(QMAKE_HOST.os, Linux|Windows) { LIBS += -lQQt } diff --git a/src/qqt.pro b/src/qqt.pro index 6a4ce476..c3da3e25 100644 --- a/src/qqt.pro +++ b/src/qqt.pro @@ -58,15 +58,18 @@ greaterThan(QT_MAJOR_VERSION, 4): { ################################################################# #QQT LIBRARY (DLL) DEFINES += QQT_LIBRARY +CONFIG += dll include ($$PWD/qqt_header.pri) equals(QKIT_, macOS) { CONFIG += dll CONFIG += lib_bundle } else:equals(QKIT_, iOS) { DEFINES -= QQT_LIBRARY + CONFIG -= dll CONFIG += staticlib } else:equals(QKIT_, WIN) { DEFINES -= QQT_LIBRARY + CONFIG -= dll CONFIG += staticlib } #CONFIG += debug_and_release diff --git a/src/qqt_header.pri b/src/qqt_header.pri index 65960aa0..5fe3d9bb 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -127,7 +127,6 @@ greaterThan(QT_MAJOR_VERSION, 4): DEFINES += __QT5__ CONFIG(debug, debug|profile|release):BUILD=Debug CONFIG(profile, debug|profile|release):BUILD=Profile CONFIG(release, debug|profile|release):BUILD=Release - equals(QKIT_, MIPS32) { SYSNAME = Mips32 } else:equals(QKIT_, LINUX) { diff --git a/src/qqt_source.pri b/src/qqt_source.pri index e3b40d56..ea237756 100644 --- a/src/qqt_source.pri +++ b/src/qqt_source.pri @@ -24,72 +24,9 @@ win32 { } } -#exquisite -SOURCES = \ - $$PWD/exquisite/qqtcustomspeedmeter.cpp \ - $$PWD/exquisite/qqtframelesshelper.cpp \ - $$PWD/exquisite/qqtframelesshelperprivate.cpp \ - $$PWD/exquisite/qqtcustompianokeyboard.cpp \ - $$PWD/exquisite/qqtrippleeffectpushbutton.cpp \ - $$PWD/exquisite/qqtrulereffectslider.cpp \ - $$PWD/exquisite/qqtflipeffectstackedwidget.cpp \ - $$PWD/exquisite/qqtledbannereffectlabel.cpp \ - $$PWD/exquisite/qqtmarqueeeffectlabel.cpp \ - $$PWD/exquisite/qqtcustomverificationcode.cpp \ - $$PWD/exquisite/qqtfadeeffectwidget.cpp \ - $$PWD/exquisite/qqtshadoweffectwidget.cpp \ - $$PWD/exquisite/qqtpopeffectdialog.cpp \ - $$PWD/exquisite/qqtcustomeffectprogressbar.cpp \ - $$PWD/widgets/qqtlabel.cpp -HEADERS = \ - $$PWD/exquisite/qqtcustomspeedmeter.h \ - $$PWD/exquisite/qqtframelesshelper.h \ - $$PWD/exquisite/qqtframelesshelperprivate.h \ - $$PWD/exquisite/qqtcustompianokeyboard.h \ - $$PWD/exquisite/qqtrippleeffectpushbutton.h \ - $$PWD/exquisite/qqtrulereffectslider.h \ - $$PWD/exquisite/qqtflipeffectstackedwidget.h \ - $$PWD/exquisite/qqtmarqueeeffectlabel.h \ - $$PWD/exquisite/qqtledbannereffectlabel.h \ - $$PWD/exquisite/qqtcustomverificationcode.h \ - $$PWD/exquisite/qqtfadeeffectwidget.h \ - $$PWD/exquisite/qqtshadoweffectwidget.h \ - $$PWD/exquisite/qqtpopeffectdialog.h \ - $$PWD/exquisite/qqtcustomeffectprogressbar.h \ - $$PWD/widgets/qqtlabel.h +SOURCES= +HEADERS= -#qrcode -#DEFINES += __QRENCODE__ -contains (DEFINES, __QRENCODE__) { - HEADERS += \ - $$PWD/qrencode/bitstream.h \ - $$PWD/qrencode/config.h \ - $$PWD/qrencode/mask.h \ - $$PWD/qrencode/mmask.h \ - $$PWD/qrencode/mqrspec.h \ - $$PWD/qrencode/qrencode.h \ - $$PWD/qrencode/qrencode_inner.h \ - $$PWD/qrencode/qrinput.h \ - $$PWD/qrencode/qrspec.h \ - $$PWD/qrencode/rscode.h \ - $$PWD/qrencode/split.h - - SOURCES += \ - $$PWD/qrencode/bitstream.c \ - $$PWD/qrencode/mask.c \ - $$PWD/qrencode/mmask.c \ - $$PWD/qrencode/mqrspec.c \ - $$PWD/qrencode/qrencode.c \ - $$PWD/qrencode/qrinput.c \ - $$PWD/qrencode/qrspec.c \ - $$PWD/qrencode/rscode.c \ - $$PWD/qrencode/split.c - - HEADERS += \ - $$PWD/exquisite/qqtcustomqrencodewidget.h - SOURCES += \ - $$PWD/exquisite/qqtcustomqrencodewidget.cpp -} #root dir win32 { @@ -325,7 +262,8 @@ SOURCES += \ $$PWD/widgets/qqtgraphicsview.cpp \ $$PWD/widgets/qqttreewidget.cpp \ $$PWD/widgets/qqtwidget.cpp \ - $$PWD/widgets/qqtwidgets.cpp + $$PWD/widgets/qqtwidgets.cpp \ + $$PWD/widgets/qqtlabel.cpp HEADERS += \ $$PWD/widgets/qqtcheckbox.h \ $$PWD/widgets/qqtheaderview.h \ @@ -347,7 +285,8 @@ HEADERS += \ $$PWD/widgets/qqttreewidget.h \ $$PWD/widgets/qqtwidget.h \ $$PWD/widgets/qqtwidgets.h \ - $$PWD/widgets/qqtapplication.h + $$PWD/widgets/qqtapplication.h \ + $$PWD/widgets/qqtlabel.h FORMS += \ $$PWD/widgets/qqtcheckbox.ui \ $$PWD/widgets/qqtlistview.ui \ @@ -362,3 +301,68 @@ FORMS += \ $$PWD/widgets/qqttablewidget.ui \ $$PWD/widgets/qqtmptablewidget.ui \ $$PWD/widgets/qqttreewidget.ui + +#exquisite +SOURCES = \ + $$PWD/exquisite/qqtcustomspeedmeter.cpp \ + $$PWD/exquisite/qqtframelesshelper.cpp \ + $$PWD/exquisite/qqtframelesshelperprivate.cpp \ + $$PWD/exquisite/qqtcustompianokeyboard.cpp \ + $$PWD/exquisite/qqtrippleeffectpushbutton.cpp \ + $$PWD/exquisite/qqtrulereffectslider.cpp \ + $$PWD/exquisite/qqtflipeffectstackedwidget.cpp \ + $$PWD/exquisite/qqtledbannereffectlabel.cpp \ + $$PWD/exquisite/qqtmarqueeeffectlabel.cpp \ + $$PWD/exquisite/qqtcustomverificationcode.cpp \ + $$PWD/exquisite/qqtfadeeffectwidget.cpp \ + $$PWD/exquisite/qqtshadoweffectwidget.cpp \ + $$PWD/exquisite/qqtpopeffectdialog.cpp \ + $$PWD/exquisite/qqtcustomeffectprogressbar.cpp +HEADERS = \ + $$PWD/exquisite/qqtcustomspeedmeter.h \ + $$PWD/exquisite/qqtframelesshelper.h \ + $$PWD/exquisite/qqtframelesshelperprivate.h \ + $$PWD/exquisite/qqtcustompianokeyboard.h \ + $$PWD/exquisite/qqtrippleeffectpushbutton.h \ + $$PWD/exquisite/qqtrulereffectslider.h \ + $$PWD/exquisite/qqtflipeffectstackedwidget.h \ + $$PWD/exquisite/qqtmarqueeeffectlabel.h \ + $$PWD/exquisite/qqtledbannereffectlabel.h \ + $$PWD/exquisite/qqtcustomverificationcode.h \ + $$PWD/exquisite/qqtfadeeffectwidget.h \ + $$PWD/exquisite/qqtshadoweffectwidget.h \ + $$PWD/exquisite/qqtpopeffectdialog.h \ + $$PWD/exquisite/qqtcustomeffectprogressbar.h + +#qrcode +#DEFINES += __QRENCODE__ +contains (DEFINES, __QRENCODE__) { + HEADERS += \ + $$PWD/qrencode/bitstream.h \ + $$PWD/qrencode/config.h \ + $$PWD/qrencode/mask.h \ + $$PWD/qrencode/mmask.h \ + $$PWD/qrencode/mqrspec.h \ + $$PWD/qrencode/qrencode.h \ + $$PWD/qrencode/qrencode_inner.h \ + $$PWD/qrencode/qrinput.h \ + $$PWD/qrencode/qrspec.h \ + $$PWD/qrencode/rscode.h \ + $$PWD/qrencode/split.h + + SOURCES += \ + $$PWD/qrencode/bitstream.c \ + $$PWD/qrencode/mask.c \ + $$PWD/qrencode/mmask.c \ + $$PWD/qrencode/mqrspec.c \ + $$PWD/qrencode/qrencode.c \ + $$PWD/qrencode/qrinput.c \ + $$PWD/qrencode/qrspec.c \ + $$PWD/qrencode/rscode.c \ + $$PWD/qrencode/split.c + + HEADERS += \ + $$PWD/exquisite/qqtcustomqrencodewidget.h + SOURCES += \ + $$PWD/exquisite/qqtcustomqrencodewidget.cpp +} diff --git a/src/widgets/qqtwidget.h b/src/widgets/qqtwidget.h index 720cf1bd..e655e745 100644 --- a/src/widgets/qqtwidget.h +++ b/src/widgets/qqtwidget.h @@ -40,7 +40,7 @@ private: quint32 m_style; // QWidget interface protected: - void paintEvent(QPaintEvent*); + void paintEvent(QPaintEvent*) override; // QWidget interface protected: