app添加紫光oem
This commit is contained in:
parent
48782f1aa7
commit
dcc0a1c90f
|
@ -103,5 +103,6 @@
|
|||
<file>image_rsc/scroll/vScrollSlider_Push.png</file>
|
||||
<file>image_rsc/action/btnEdit.png</file>
|
||||
<file>image_rsc/logo/Microtek_logo.ico</file>
|
||||
<file>image_rsc/logo/uniscan.ico</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -61,6 +61,8 @@ HGResult VersionDll::Load()
|
|||
strcat(dllPath, "CTSVersion.dll");
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
strcat(dllPath, "ZJVersion.dll");
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
strcat(dllPath, "ZGVersion.dll");
|
||||
#else
|
||||
strcat(dllPath, "HGVersion.dll");
|
||||
#endif
|
||||
|
@ -73,6 +75,8 @@ HGResult VersionDll::Load()
|
|||
strcpy(dllPath, "libCtsVersion.so");
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
strcpy(dllPath, "libZjVersion.so");
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
strcpy(dllPath, "libZgVersion.so");
|
||||
#else
|
||||
strcpy(dllPath, "libHGVersion.so");
|
||||
#endif
|
||||
|
|
|
@ -43,6 +43,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
|
|||
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("CTSScan")));
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZJScan")));
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZGScan")));
|
||||
#else
|
||||
ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan")));
|
||||
#endif
|
||||
|
|
|
@ -33,6 +33,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
|
|||
oemName = HGVERSION_OEMNAME_CUMTENN;
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
oemName = HGVERSION_OEMNAME_MICROTEK;
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
oemName = HGVERSION_OEMNAME_UNISCAN;
|
||||
#else
|
||||
oemName = HGVERSION_OEMNAME_HUAGO;
|
||||
#endif
|
||||
|
|
|
@ -27,6 +27,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
|
|||
oemName = HGVERSION_OEMNAME_CUMTENN;
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
oemName = HGVERSION_OEMNAME_MICROTEK;
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
oemName = HGVERSION_OEMNAME_UNISCAN;
|
||||
#else
|
||||
oemName = HGVERSION_OEMNAME_HUAGO;
|
||||
#endif
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
|
@ -112,6 +112,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
|||
this->setWindowIcon(QIcon(":images/image_rsc/logo/Microtek_logo.ico"));
|
||||
this->setWindowTitle(tr("MicrotekScan"));
|
||||
m_oemName = HGVERSION_OEMNAME_MICROTEK;
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/uniscan.ico"));
|
||||
this->setWindowTitle(tr("UniScan"));
|
||||
m_oemName = HGVERSION_OEMNAME_UNISCAN;
|
||||
#else
|
||||
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
|
||||
this->setWindowTitle(tr("HuaGoScan"));
|
||||
|
@ -354,6 +358,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
|
|||
m_password = "cumtenn";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
m_password = "microtek";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
m_password = "uniscan";
|
||||
#else
|
||||
m_password = "huagoscan";
|
||||
#endif
|
||||
|
@ -3168,6 +3174,8 @@ void MainWindow::on_act_help_triggered()
|
|||
QString filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
QString filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
QString filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf";
|
||||
#else
|
||||
QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
|
@ -3195,6 +3203,8 @@ void MainWindow::on_act_help_triggered()
|
|||
filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
filename = "/opt/apps/com.uniscanchina.uniscan/entries/help/UniScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
|
@ -3209,6 +3219,8 @@ void MainWindow::on_act_help_triggered()
|
|||
filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
filename = "/opt/apps/scanner-driver-uniscan/doc/UniScan_App_Help_manual.pdf";
|
||||
#else
|
||||
filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf";
|
||||
#endif
|
||||
|
@ -3905,6 +3917,13 @@ void MainWindow::upgradeApp(QString pkgPath)
|
|||
// QFile::copy(curPath + "ZJBase.dll", tmpPath + "ZJBase.dll");
|
||||
// QFile::remove(tmpPath + "ZJVersion.dll");
|
||||
// QFile::copy(curPath + "ZJVersion.dll", tmpPath + "ZJVersion.dll");
|
||||
// #elif defined(OEM_ZIGUANG)
|
||||
// QFile::remove(tmpPath + "ZGUpgradeApp.exe");
|
||||
// QFile::copy(curPath + "ZGUpgradeApp.exe", tmpPath + "ZGUpgradeApp.exe");
|
||||
// QFile::remove(tmpPath + "ZGBase.dll");
|
||||
// QFile::copy(curPath + "ZGBase.dll", tmpPath + "ZGBase.dll");
|
||||
// QFile::remove(tmpPath + "ZGVersion.dll");
|
||||
// QFile::copy(curPath + "ZGVersion.dll", tmpPath + "ZGVersion.dll");
|
||||
// #else
|
||||
|
||||
QFile::remove(tmpPath + "HGUpgradeApp.exe");
|
||||
|
@ -3965,6 +3984,13 @@ void MainWindow::upgradeApp(QString pkgPath)
|
|||
// //QFile::copy(curPath + "libZjBase.so", tmpPath + "libZjBase.so");
|
||||
// //QFile::remove(tmpPath + "libZjVersion.so");
|
||||
// //QFile::copy(curPath + "libZjVersion.so", tmpPath + "libZjVersion.so");
|
||||
// #elif defined(OEM_ZIGUANG)
|
||||
// QFile::remove(tmpPath + "ZgUpgradeApp");
|
||||
// QFile::copy(curPath + "ZgUpgradeApp", tmpPath + "ZgUpgradeApp");
|
||||
// //QFile::remove(tmpPath + "libZgBase.so");
|
||||
// //QFile::copy(curPath + "libZgBase.so", tmpPath + "libZgBase.so");
|
||||
// //QFile::remove(tmpPath + "libZgVersion.so");
|
||||
// //QFile::copy(curPath + "libZgVersion.so", tmpPath + "libZgVersion.so");
|
||||
// #else
|
||||
QFile::remove(tmpPath + "HGUpgradeApp");
|
||||
QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp");
|
||||
|
@ -3993,6 +4019,8 @@ void MainWindow::upgradeApp(QString pkgPath)
|
|||
// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList);
|
||||
// #elif defined(OEM_ZHONGJING)
|
||||
// isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList);
|
||||
// #elif defined(OEM_ZIGUANG)
|
||||
// isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList);
|
||||
// #else
|
||||
isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList);
|
||||
// #endif
|
||||
|
@ -4005,6 +4033,8 @@ void MainWindow::upgradeApp(QString pkgPath)
|
|||
// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList);
|
||||
// #elif defined(OEM_ZHONGJING)
|
||||
// isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList);
|
||||
// #elif defined(OEM_ZIGUANG)
|
||||
// isSuccessdStart = proc.startDetached(tmpPath + "ZgUpgradeApp", argList);
|
||||
// #else
|
||||
isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList);
|
||||
// #endif
|
||||
|
|
|
@ -24,6 +24,8 @@ bool AppIsRun(const std::string& appName)
|
|||
std::wstring regName = L"SOFTWARE\\CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
std::wstring regName = L"SOFTWARE\\MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
std::wstring regName = L"SOFTWARE\\UniScan";
|
||||
#else
|
||||
std::wstring regName = L"SOFTWARE\\HuaGoScan";
|
||||
#endif
|
||||
|
@ -109,6 +111,9 @@ bool AppIsRun(const std::string& appName)
|
|||
#elif defined(OEM_ZHONGJING)
|
||||
cmd = "ps -wef | grep MicrotekScan";
|
||||
appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
cmd = "ps -wef | grep UniScan";
|
||||
appPath = "/opt/apps/com.uniscanchina.uniscan/files/bin/UniScan";
|
||||
#else
|
||||
cmd = "ps -wef | grep HuaGoScan";
|
||||
appPath = "/opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan";
|
||||
|
@ -128,6 +133,9 @@ bool AppIsRun(const std::string& appName)
|
|||
#elif defined(OEM_ZHONGJING)
|
||||
cmd = "ps -wef | grep MicrotekScan";
|
||||
appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
cmd = "ps -wef | grep UniScan";
|
||||
appPath = "/opt/apps/scanner-driver-uniscan/bin/UniScan";
|
||||
#else
|
||||
cmd = "ps -wef | grep HuaGoScan";
|
||||
appPath = "/opt/apps/scanner-driver-huagao/bin/HuaGoScan";
|
||||
|
@ -175,6 +183,8 @@ void RunApp(const std::string& appName)
|
|||
std::wstring regName = L"SOFTWARE\\CumtennScan";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
std::wstring regName = L"SOFTWARE\\MicrotekScan";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
std::wstring regName = L"SOFTWARE\\UniScan";
|
||||
#else
|
||||
std::wstring regName = L"SOFTWARE\\HuaGoScan";
|
||||
#endif
|
||||
|
@ -222,6 +232,8 @@ void RunApp(const std::string& appName)
|
|||
appPath = "sh /opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan.sh &";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
appPath = "sh /opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan.sh &";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
appPath = "sh /opt/apps/com.uniscanchina.uniscan/files/bin/UniScan.sh &";
|
||||
#else
|
||||
appPath = "sh /opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan.sh &";
|
||||
#endif
|
||||
|
@ -236,6 +248,8 @@ void RunApp(const std::string& appName)
|
|||
appPath = "sh /opt/apps/scanner-driver-cumtenn/bin/CumtennScan.sh &";
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &";
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
appPath = "sh /opt/apps/scanner-driver-uniscan/bin/UniScan.sh &";
|
||||
#else
|
||||
appPath = "sh /opt/apps/scanner-driver-huagao/bin/HuaGoScan.sh &";
|
||||
#endif
|
||||
|
|
|
@ -48,6 +48,8 @@ int main(int argc, char *argv[])
|
|||
oemName = HGVERSION_OEMNAME_CUMTENN;
|
||||
#elif defined(OEM_ZHONGJING)
|
||||
oemName = HGVERSION_OEMNAME_MICROTEK;
|
||||
#elif defined(OEM_ZIGUANG)
|
||||
oemName = HGVERSION_OEMNAME_UNISCAN;
|
||||
#else
|
||||
oemName = HGVERSION_OEMNAME_HUAGO;
|
||||
#endif
|
||||
|
|
|
@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO
|
|||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico
|
||||
}
|
||||
|
@ -32,6 +32,9 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
|
|||
contains(DEFINES, OEM_ZHONGJING) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
|
||||
}
|
||||
} else {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
|
||||
}
|
||||
|
@ -40,7 +43,7 @@ win32 {
|
|||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
LIBS += -ladvapi32 -lpsapi
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG) {
|
||||
LIBS += -lHWBase -lHWVersion
|
||||
TARGET = HWFWUpgradeApp
|
||||
|
@ -81,6 +84,16 @@ win32 {
|
|||
LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane
|
||||
}
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG) {
|
||||
LIBS += -lZGBase -lZGVersion
|
||||
TARGET = ZGFWUpgradeApp
|
||||
contains(QT_ARCH, i386) {
|
||||
LIBS += -L../../../../sdk/lib/win/x86/OEM/uniscan -lsane
|
||||
}
|
||||
contains(QT_ARCH, x86_64){
|
||||
LIBS += -L../../../../sdk/lib/win/x64/OEM/uniscan -lsane
|
||||
}
|
||||
}
|
||||
} else {
|
||||
LIBS += -lHGBase -lHGVersion
|
||||
TARGET = HGFWUpgradeApp
|
||||
|
@ -121,7 +134,7 @@ unix {
|
|||
message($$ARCH)
|
||||
QMAKE_LFLAGS += -Wl,-rpath=.
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG){
|
||||
LIBS += -lHwBase -lHwVersion -lsane-hwsane -lhwdriver
|
||||
TARGET = HwFWUpgradeApp
|
||||
|
@ -138,6 +151,10 @@ unix {
|
|||
LIBS += -lZjBase -lZjVersion -lsane-zjsane -lzjdriver
|
||||
TARGET = ZjFWUpgradeApp
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG){
|
||||
LIBS += -lZgBase -lZgVersion -lsane-zgsane -lzgdriver
|
||||
TARGET = ZgFWUpgradeApp
|
||||
}
|
||||
} else {
|
||||
LIBS += -lHGBase -lHGVersion -lsane-hgsane -lhgdriver
|
||||
TARGET = HGFWUpgradeApp
|
||||
|
|
|
@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO
|
|||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico
|
||||
TARGET = HanvonScan
|
||||
|
@ -36,6 +36,10 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
|
|||
RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico
|
||||
TARGET = MicrotekScan
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
|
||||
TARGET = UniScan
|
||||
}
|
||||
} else {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
|
||||
TARGET = HuaGoScan
|
||||
|
@ -45,7 +49,7 @@ win32 {
|
|||
DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
LIBS += -ladvapi32
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG) {
|
||||
LIBS += -lHWBase -lHWImgFmt -lHWImgProc
|
||||
contains(QT_ARCH, i386) {
|
||||
|
@ -82,6 +86,15 @@ win32 {
|
|||
LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane -llang
|
||||
}
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG) {
|
||||
LIBS += -lZGBase -lZGImgFmt -lZGImgProc
|
||||
contains(QT_ARCH, i386) {
|
||||
LIBS += -L../../../../sdk/lib/win/x86/OEM/uniscan -lsane -llang
|
||||
}
|
||||
contains(QT_ARCH, x86_64){
|
||||
LIBS += -L../../../../sdk/lib/win/x64/OEM/uniscan -lsane -llang
|
||||
}
|
||||
}
|
||||
} else {
|
||||
LIBS += -lHGBase -lHGImgFmt -lHGImgProc
|
||||
contains(QT_ARCH, i386) {
|
||||
|
@ -121,7 +134,7 @@ unix {
|
|||
message($$ARCH)
|
||||
QMAKE_LFLAGS += -Wl,-rpath=.
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG){
|
||||
LIBS += -lHwBase -lHwImgFmt -lHwImgProc -lsane-hwsane -lhwdriver
|
||||
}
|
||||
|
@ -134,6 +147,9 @@ unix {
|
|||
contains(DEFINES, OEM_ZHONGJING){
|
||||
LIBS += -lZjBase -lZjImgFmt -lZjImgProc -lsane-zjsane -lzjdriver
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG){
|
||||
LIBS += -lZgBase -lZgImgFmt -lZgImgProc -lsane-zgsane -lzgdriver
|
||||
}
|
||||
} else {
|
||||
LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO
|
|||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico
|
||||
}
|
||||
|
@ -32,6 +32,9 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai
|
|||
contains(DEFINES, OEM_ZHONGJING) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG) {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
|
||||
}
|
||||
} else {
|
||||
RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
|
||||
}
|
||||
|
@ -59,7 +62,7 @@ win32 {
|
|||
}
|
||||
}
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG) {
|
||||
LIBS += -lHWBase -lHWVersion
|
||||
TARGET = HWUpgradeApp
|
||||
|
@ -76,6 +79,10 @@ win32 {
|
|||
LIBS += -lZJBase -lZJVersion
|
||||
TARGET = ZJUpgradeApp
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG) {
|
||||
LIBS += -lZGBase -lZGVersion
|
||||
TARGET = ZGUpgradeApp
|
||||
}
|
||||
} else {
|
||||
LIBS += -lHGBase -lHGVersion
|
||||
TARGET = HGUpgradeApp
|
||||
|
@ -90,7 +97,7 @@ unix {
|
|||
message($$ARCH)
|
||||
QMAKE_LFLAGS += -Wl,-rpath=.
|
||||
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) {
|
||||
if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) {
|
||||
contains(DEFINES, OEM_HANWANG){
|
||||
LIBS += -lHwBase -lHwVersion
|
||||
TARGET = HwUpgradeApp
|
||||
|
@ -107,6 +114,10 @@ unix {
|
|||
LIBS += -lZjBase -lZjVersion
|
||||
TARGET = ZjUpgradeApp
|
||||
}
|
||||
contains(DEFINES, OEM_ZIGUANG){
|
||||
LIBS += -lZgBase -lZgVersion
|
||||
TARGET = ZgUpgradeApp
|
||||
}
|
||||
} else {
|
||||
LIBS += -lHGBase -lHGVersion
|
||||
TARGET = HGUpgradeApp
|
||||
|
|
Loading…
Reference in New Issue