diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-04-13 09:56:37 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-04-13 13:02:15 +0000 |
| commit | a68b518c322d6392f725c8cb8757e02d7aface21 (patch) | |
| tree | 43070d4b3f032d53cda3be897f104871e91d4455 | |
| parent | 9eb7ea5bcbf258a8dea16cd479125ef28262f879 (diff) | |
Move the QKnxGroupAddressInfo* classes into the knxproj directoryv5.11.0-beta4
Change-Id: I56b6bff68f8df1ba41c30aae3edf01db79b0cb46
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | src/knx/knx.pro | 4 | ||||
| -rw-r--r-- | src/knx/knxproj/knxproj.pri | 15 | ||||
| -rw-r--r-- | src/knx/knxproj/qknxgroupaddressinfo.cpp (renamed from src/knx/qknxgroupaddressinfo.cpp) | 0 | ||||
| -rw-r--r-- | src/knx/knxproj/qknxgroupaddressinfo.h (renamed from src/knx/qknxgroupaddressinfo.h) | 0 | ||||
| -rw-r--r-- | src/knx/knxproj/qknxgroupaddressinfos.cpp (renamed from src/knx/qknxgroupaddressinfos.cpp) | 0 | ||||
| -rw-r--r-- | src/knx/knxproj/qknxgroupaddressinfos.h (renamed from src/knx/qknxgroupaddressinfos.h) | 0 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/knx/knx.pro b/src/knx/knx.pro index 24358ee..7574f89 100644 --- a/src/knx/knx.pro +++ b/src/knx/knx.pro @@ -22,8 +22,6 @@ PUBLIC_HEADERS += \ qknxdeviceconfiguration.h \ qknxextendedcontrolfield.h \ qknxglobal.h \ - qknxgroupaddressinfo.h \ - qknxgroupaddressinfos.h \ qknxinterfaceobjectproperty.h \ qknxinterfaceobjectpropertydatatype.h \ qknxinterfaceobjecttype.h \ @@ -50,8 +48,6 @@ SOURCES += \ qknxcontrolfield.cpp \ qknxdeviceconfiguration.cpp \ qknxextendedcontrolfield.cpp \ - qknxgroupaddressinfo.cpp \ - qknxgroupaddressinfos.cpp \ qknxinterfaceobjectproperty.cpp \ qknxinterfaceobjectpropertydatatype.cpp \ qknxinterfaceobjecttype.cpp \ diff --git a/src/knx/knxproj/knxproj.pri b/src/knx/knxproj/knxproj.pri index 08acabd..924a3d2 100644 --- a/src/knx/knxproj/knxproj.pri +++ b/src/knx/knxproj/knxproj.pri @@ -10,6 +10,8 @@ SOURCES += \ $$PWD/qknxbuildings.cpp \ $$PWD/qknxdeviceinstance.cpp \ $$PWD/qknxgroupaddresses.cpp \ + $$PWD/qknxgroupaddressinfo.cpp \ + $$PWD/qknxgroupaddressinfos.cpp \ $$PWD/qknxinstallation.cpp \ $$PWD/qknxprojectinformation.cpp \ $$PWD/qknxprojectroot.cpp \ @@ -17,10 +19,7 @@ SOURCES += \ $$PWD/qknxtopology.cpp \ $$PWD/qzip.cpp -PRIVATE_HEADERS += $$PWD/qzipreader_p.h - $$PWD/qzipwriter_p.h - -HEADERS += \ +PRIVATE_HEADERS += \ $$PWD/qknxbuildings_p.h \ $$PWD/qknxdeviceinstance_p.h \ $$PWD/qknxgroupaddresses_p.h \ @@ -28,4 +27,10 @@ HEADERS += \ $$PWD/qknxprojectinformation_p.h \ $$PWD/qknxprojectroot_p.h \ $$PWD/qknxprojectutils_p.h \ - $$PWD/qknxtopology_p.h + $$PWD/qknxtopology_p.h \ + $$PWD/qzipreader_p.h \ + $$PWD/qzipwriter_p.h + +HEADERS += \ + $$PWD/qknxgroupaddressinfo.h \ + $$PWD/qknxgroupaddressinfos.h diff --git a/src/knx/qknxgroupaddressinfo.cpp b/src/knx/knxproj/qknxgroupaddressinfo.cpp index 3e2b5c7..3e2b5c7 100644 --- a/src/knx/qknxgroupaddressinfo.cpp +++ b/src/knx/knxproj/qknxgroupaddressinfo.cpp diff --git a/src/knx/qknxgroupaddressinfo.h b/src/knx/knxproj/qknxgroupaddressinfo.h index 4fc3d8d..4fc3d8d 100644 --- a/src/knx/qknxgroupaddressinfo.h +++ b/src/knx/knxproj/qknxgroupaddressinfo.h diff --git a/src/knx/qknxgroupaddressinfos.cpp b/src/knx/knxproj/qknxgroupaddressinfos.cpp index 092991e..092991e 100644 --- a/src/knx/qknxgroupaddressinfos.cpp +++ b/src/knx/knxproj/qknxgroupaddressinfos.cpp diff --git a/src/knx/qknxgroupaddressinfos.h b/src/knx/knxproj/qknxgroupaddressinfos.h index e1c0fb9..e1c0fb9 100644 --- a/src/knx/qknxgroupaddressinfos.h +++ b/src/knx/knxproj/qknxgroupaddressinfos.h |