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

Merge branch 'master' of http://192.168.100.140:8099/sane/code_app

This commit is contained in:
luoliangyi 2022-06-15 19:09:38 +08:00
parent 5f1bbefbd6 7f386a2f7c
commit 504ca85feb
3 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/scanner/mainwindow.cpp
View File

@ -77,7 +77,13 @@ MainWindow::MainWindow(QWidget *parent)
#endif
this->setAutoFillBackground(true);
this->setPalette(QPalette(QColor(230, 230, 230)));
resize(950,720);
QDesktopWidget *desktopWidget = QApplication::desktop();
QRect screenRect = desktopWidget->screenGeometry(this);
if(screenRect.width() > 950 && screenRect.height() > 720)
{
resize(950, 720);
}
m_config.load();
@ -2480,7 +2486,13 @@ void MainWindow::on_act_help_triggered()
QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf";
#endif
#else
QString filename = nullptr;
#if defined(OEM_HANWANG)
QString filename = "/opt/apps/scanner-driver-hanvon/doc/HanvonScan_App_Help_manual.pdf";
#elif defined(OEM_LISICHENG)
QString filename = "/opt/apps/scanner-driver-lanxum/doc/LanxumScan_App_Help_manual.pdf";
#else
QString filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf";
#endif
#endif
#endif

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

@ -110,6 +110,34 @@ unix {
}
}
}else{
contains(ARCH, x86_64){
LIBS += -L../../../release/kylin/x86_64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
DESTDIR = ../../../release/kylin/x86_64/
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, aarch64){
LIBS += -L../../../release/kylin/aarch64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
DESTDIR = ../../../release/kylin/aarch64/
}
CONFIG(debug, debug|release) {
}
}
contains(ARCH, mips64){
LIBS += -L../../../release/kylin/mips64 -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver
CONFIG(release, debug|release) {
DESTDIR = ../../../release/kylin/mips64/
}
CONFIG(debug, debug|release) {
}
}
}
}

2
build.sh
View File

@ -17,6 +17,8 @@ then
elif [ ${systype} = "Kylin" ]
then
system="kylin"
else
system="kylin"
fi
echo ${system}