Use global interfaces.h
This commit is contained in:
		
							
								
								
									
										12
									
								
								DCPlugin.pro
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								DCPlugin.pro
									
									
									
									
									
								
							@@ -30,7 +30,14 @@ contains( CONFIG, PTU5 ) {
 | 
			
		||||
    QMAKE_CXXFLAGS += -std=c++11
 | 
			
		||||
    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
			
		||||
    CONFIG += link_pkgconfig
 | 
			
		||||
    PTU5BASEPATH = /opt/devel/ptu5
 | 
			
		||||
    ARCH = PTU5
 | 
			
		||||
 | 
			
		||||
    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/deviceController/include/
 | 
			
		||||
    LIBS += -L$$PTU5BASEPATH/qt/libs/deviceController/library
 | 
			
		||||
 | 
			
		||||
    LIBS += -lCAslave
 | 
			
		||||
    LIBS += -lCAmaster
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
contains( CONFIG, PTU5_YOCTO ) {
 | 
			
		||||
@@ -38,8 +45,8 @@ contains( CONFIG, PTU5_YOCTO ) {
 | 
			
		||||
    PTU5BASEPATH = /opt/devel/ptu5
 | 
			
		||||
    ARCH = PTU5
 | 
			
		||||
 | 
			
		||||
    # add qmqtt lib
 | 
			
		||||
    #LIBS += -lQt5Qmqtt
 | 
			
		||||
    LIBS += -lCAslave
 | 
			
		||||
    LIBS += -lCAmaster
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
TARGET   = ATBDeviceControllerPlugin
 | 
			
		||||
@@ -69,7 +76,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
			
		||||
 | 
			
		||||
# ATBAPP interface
 | 
			
		||||
HEADERS += \
 | 
			
		||||
    include/interfaces.h \
 | 
			
		||||
    src/ATBAPP/ATBAPPplugin.h \
 | 
			
		||||
    src/ATBAPP/DeviceControllerDiag.h \
 | 
			
		||||
    src/ATBAPP/DeviceControllerInterface.h \
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@
 | 
			
		||||
 | 
			
		||||
#include "support/PersistentData.h"
 | 
			
		||||
 | 
			
		||||
#include "interfaces.h"
 | 
			
		||||
#include <DeviceController/interfaces.h>
 | 
			
		||||
 | 
			
		||||
#include <unistd.h>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -5,9 +5,10 @@
 | 
			
		||||
#include <QSet>
 | 
			
		||||
#include <QTimer>
 | 
			
		||||
 | 
			
		||||
#include "ATBMachineEvent.h"
 | 
			
		||||
#include "interfaces.h"
 | 
			
		||||
#include <DeviceController/interfaces.h>
 | 
			
		||||
 | 
			
		||||
#include "DeviceControllerInterface.h"
 | 
			
		||||
#include "ATBMachineEvent.h"
 | 
			
		||||
 | 
			
		||||
#include "support/PersistentData.h"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
#define CASHUTILS_H
 | 
			
		||||
 | 
			
		||||
#include <QObject>
 | 
			
		||||
#include "interfaces.h"
 | 
			
		||||
#include <DeviceController/interfaces.h>
 | 
			
		||||
 | 
			
		||||
namespace CashUtils {
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user