lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整app QAction 版本不兼容问题

This commit is contained in:
modehua 2023-01-29 15:24:02 +08:00
parent d3313b271b
commit 40d46fa0b5
2 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scanner/mainwindow.cpp
View File

@ -161,8 +161,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
ui->toolBar->addAction(ui->act_help);
m_menu_language = new QMenu(tr("menu_language"));
m_act_simpCN = new QAction(tr("act_simpCN"));
m_act_English = new QAction(tr("act_English"));
m_act_simpCN = new QAction(tr("act_simpCN"),nullptr);
m_act_English = new QAction(tr("act_English"),nullptr);
m_act_simpCN->setCheckable(true);
m_act_English->setCheckable(true);
ui->menu_info->addMenu(m_menu_language);

107
build-qt/HGSolution/HGScanner/HGScanner.pro
View File

@ -3,7 +3,7 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++11
QMAKE_CXXFLAGS += -std=c++0x
# The following define makes your compiler emit warnings if you use
# any Qt feature that has been marked deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
@ -24,37 +24,38 @@ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
TARGET = HuaGoScan
win32 {
DEFINES += _CRT_SECURE_NO_WARNINGS
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
contains(QT_ARCH, i386) {
DEFINES += _CRT_SECURE_NO_WARNINGS
QMAKE_LFLAGS += /MANIFESTUAC:"level='requireAdministrator' uiAccess='false'"
contains(QT_ARCH, i386) {
LIBS += -L../../../../sdk/lib/win/x86/Release -lHGBase -lHGImgFmt -lHGImgProc
LIBS += -L../../../../sdk/lib/win/x86/OEM/huagao -lsane
CONFIG(release, debug|release) {
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/win/x86/Release/
}
CONFIG(debug, debug|release) {
}
CONFIG(debug, debug|release) {
}
}
}
}
contains(QT_ARCH, x86_64){
LIBS += -L../../../../sdk/lib/win/x64/Release -lHGBase -lHGImgFmt -lHGImgProc
LIBS += -L../../../../sdk/lib/win/x64/OEM/huagao -lsane
CONFIG(release, debug|release) {
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/win/x64/Release/
}
CONFIG(debug, debug|release) {
}
}
}
}
unix {
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1)
message($$DISTRIBUTION)
ARCH = $$system(arch)
message($$ARCH)
LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
DISTRIBUTION = $$system(cat /etc/issue | cut -d\' \' -f1)
message($$DISTRIBUTION)
ARCH = $$system(arch)
message($$ARCH)
QMAKE_LFLAGS += -Wl,-rpath=.
@ -63,50 +64,50 @@ unix {
DEFINES += UOS
contains(ARCH, x86_64){
DEFINES += x86_64
LIBS += -L../../../../release/uos/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
LIBS += -L../../../../release/uos/x86_64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/x86_64/
}
CONFIG(debug, debug|release) {
}
}
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, aarch64){
DEFINES += aarch64
LIBS += -L../../../../release/uos/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
LIBS += -L../../../../release/uos/aarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/aarch64/
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, mips64){
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, mips64){
DEFINES += mips64
LIBS += -L../../../../release/uos/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
LIBS += -L../../../../release/uos/mips64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/mips64/
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, loongarch64){
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, loongarch64){
DEFINES += loongarch64
LIBS += -L../../../../release/uos/loongarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
LIBS += -L../../../../release/uos/loongarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/uos/loongarch64/
}
CONFIG(debug, debug|release) {
}
}
}else{
}
CONFIG(debug, debug|release) {
}
}
}else{
message('KYLIN')
DEFINES += KYLIN
contains(ARCH, x86_64){
DEFINES += x86_64
LIBS += -L../../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/x86_64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver -llang
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/x86_64/
}
@ -116,7 +117,7 @@ unix {
}
contains(ARCH, aarch64){
DEFINES += aarch64
LIBS += -L../../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/aarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/aarch64/
}
@ -126,7 +127,7 @@ unix {
}
contains(ARCH, mips64){
DEFINES += mips64
LIBS += -L../../../../release/kylin/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/mips64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/mips64/
}
@ -134,9 +135,9 @@ unix {
}
}
contains(ARCH, loongarch64){
contains(ARCH, loongarch64){
DEFINES += loongarch64
LIBS += -L../../../../release/kylin/loongarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
LIBS += -L../../../../release/kylin/loongarch64 #-lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
DESTDIR = ../../../../release/kylin/loongarch64/
}