From 9077d50804ca5b7e97314342b6cd719c96ccae1e Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Sat, 28 Mar 2020 15:11:08 +0800 Subject: [PATCH] update highgrade --- .../{ => private}/qqtmessagequeueprivate.cpp | 0 .../{ => private}/qqtmessagequeueprivate.h | 0 .../qqtnamedpipeclient.cpp | 0 .../{network => private}/qqtnamedpipeclient.h | 0 .../{ => private}/qqtnamedpipeprivate.cpp | 0 .../{ => private}/qqtnamedpipeprivate.h | 0 .../qqtnamedpipeserver.cpp | 0 .../{network => private}/qqtnamedpipeserver.h | 0 .../qqtsingletonapplicationprivate.cpp | 0 .../qqtsingletonapplicationprivate.h | 0 src/qqt_header.pri | 1 - src/qqt_source.pri | 25 ++++++++++--------- 12 files changed, 13 insertions(+), 13 deletions(-) rename src/highgrade/{ => private}/qqtmessagequeueprivate.cpp (100%) rename src/highgrade/{ => private}/qqtmessagequeueprivate.h (100%) rename src/highgrade/{network => private}/qqtnamedpipeclient.cpp (100%) rename src/highgrade/{network => private}/qqtnamedpipeclient.h (100%) rename src/highgrade/{ => private}/qqtnamedpipeprivate.cpp (100%) rename src/highgrade/{ => private}/qqtnamedpipeprivate.h (100%) rename src/highgrade/{network => private}/qqtnamedpipeserver.cpp (100%) rename src/highgrade/{network => private}/qqtnamedpipeserver.h (100%) rename src/highgrade/{ => private}/qqtsingletonapplicationprivate.cpp (100%) rename src/highgrade/{ => private}/qqtsingletonapplicationprivate.h (100%) diff --git a/src/highgrade/qqtmessagequeueprivate.cpp b/src/highgrade/private/qqtmessagequeueprivate.cpp similarity index 100% rename from src/highgrade/qqtmessagequeueprivate.cpp rename to src/highgrade/private/qqtmessagequeueprivate.cpp diff --git a/src/highgrade/qqtmessagequeueprivate.h b/src/highgrade/private/qqtmessagequeueprivate.h similarity index 100% rename from src/highgrade/qqtmessagequeueprivate.h rename to src/highgrade/private/qqtmessagequeueprivate.h diff --git a/src/highgrade/network/qqtnamedpipeclient.cpp b/src/highgrade/private/qqtnamedpipeclient.cpp similarity index 100% rename from src/highgrade/network/qqtnamedpipeclient.cpp rename to src/highgrade/private/qqtnamedpipeclient.cpp diff --git a/src/highgrade/network/qqtnamedpipeclient.h b/src/highgrade/private/qqtnamedpipeclient.h similarity index 100% rename from src/highgrade/network/qqtnamedpipeclient.h rename to src/highgrade/private/qqtnamedpipeclient.h diff --git a/src/highgrade/qqtnamedpipeprivate.cpp b/src/highgrade/private/qqtnamedpipeprivate.cpp similarity index 100% rename from src/highgrade/qqtnamedpipeprivate.cpp rename to src/highgrade/private/qqtnamedpipeprivate.cpp diff --git a/src/highgrade/qqtnamedpipeprivate.h b/src/highgrade/private/qqtnamedpipeprivate.h similarity index 100% rename from src/highgrade/qqtnamedpipeprivate.h rename to src/highgrade/private/qqtnamedpipeprivate.h diff --git a/src/highgrade/network/qqtnamedpipeserver.cpp b/src/highgrade/private/qqtnamedpipeserver.cpp similarity index 100% rename from src/highgrade/network/qqtnamedpipeserver.cpp rename to src/highgrade/private/qqtnamedpipeserver.cpp diff --git a/src/highgrade/network/qqtnamedpipeserver.h b/src/highgrade/private/qqtnamedpipeserver.h similarity index 100% rename from src/highgrade/network/qqtnamedpipeserver.h rename to src/highgrade/private/qqtnamedpipeserver.h diff --git a/src/highgrade/qqtsingletonapplicationprivate.cpp b/src/highgrade/private/qqtsingletonapplicationprivate.cpp similarity index 100% rename from src/highgrade/qqtsingletonapplicationprivate.cpp rename to src/highgrade/private/qqtsingletonapplicationprivate.cpp diff --git a/src/highgrade/qqtsingletonapplicationprivate.h b/src/highgrade/private/qqtsingletonapplicationprivate.h similarity index 100% rename from src/highgrade/qqtsingletonapplicationprivate.h rename to src/highgrade/private/qqtsingletonapplicationprivate.h diff --git a/src/qqt_header.pri b/src/qqt_header.pri index b9c1f92a..845c2f73 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -83,7 +83,6 @@ defineTest(add_include_QQt){ #highgrade module command += $${header_path}/highgrade - command += $${header_path}/highgrade/network INCLUDEPATH += $$add_host_path($$command) export(INCLUDEPATH) diff --git a/src/qqt_source.pri b/src/qqt_source.pri index 2c6fe762..85865645 100644 --- a/src/qqt_source.pri +++ b/src/qqt_source.pri @@ -619,6 +619,8 @@ contains (DEFINES, __EXQUISITE__) { } contains (DEFINES, __HIGHGRADE__) { + INCLUDEPATH += $${PWD}/highgrade/private + #shared memory #core module contains(DEFINES, __SHAREDMEMORY_SUPPORT__){ @@ -630,9 +632,9 @@ contains (DEFINES, __HIGHGRADE__) { contains(DEFINES, __MESSAGEQUEUE_SUPPORT__){ SOURCES += \ - $$PWD/highgrade/qqtmessagequeueprivate.cpp + $$PWD/highgrade/private/qqtmessagequeueprivate.cpp HEADERS += \ - $$PWD/highgrade/qqtmessagequeueprivate.h + $$PWD/highgrade/private/qqtmessagequeueprivate.h #基于tcp socket实现 SOURCES += \ $$PWD/highgrade/qqtmessagequeue.cpp @@ -644,17 +646,16 @@ contains (DEFINES, __HIGHGRADE__) { #network module contains(DEFINES, __NAMEDPIPE_SUPPORT__){ #local client iodevice - SOURCES += $$PWD/highgrade/network/qqtnamedpipeclient.cpp - HEADERS += $$PWD/highgrade/network/qqtnamedpipeclient.h + SOURCES += $$PWD/highgrade/private/qqtnamedpipeclient.cpp + HEADERS += $$PWD/highgrade/private/qqtnamedpipeclient.h #local server iodevice - SOURCES += $$PWD/highgrade/network/qqtnamedpipeserver.cpp - HEADERS += $$PWD/highgrade/network/qqtnamedpipeserver.h + SOURCES += $$PWD/highgrade/private/qqtnamedpipeserver.cpp + HEADERS += $$PWD/highgrade/private/qqtnamedpipeserver.h + + SOURCES += $$PWD/highgrade/private/qqtnamedpipeprivate.cpp + HEADERS += $$PWD/highgrade/private/qqtnamedpipeprivate.h - SOURCES += \ - $$PWD/highgrade/qqtnamedpipeprivate.cpp - HEADERS += \ - $$PWD/highgrade/qqtnamedpipeprivate.h SOURCES += \ $$PWD/highgrade/qqtnamedpipe.cpp HEADERS += \ @@ -664,9 +665,9 @@ contains (DEFINES, __HIGHGRADE__) { #singleton application contains(DEFINES, __NAMEDPIPE_SUPPORT__){ SOURCES += \ - $$PWD/highgrade/qqtsingletonapplicationprivate.cpp + $$PWD/highgrade/private/qqtsingletonapplicationprivate.cpp HEADERS += \ - $$PWD/highgrade/qqtsingletonapplicationprivate.h + $$PWD/highgrade/private/qqtsingletonapplicationprivate.h #依赖local socket SOURCES += \ $$PWD/highgrade/qqtsingletonapplication.cpp