解决app在麒麟系统上编译不过的问题

This commit is contained in:
luoliangyi 2022-05-24 13:45:07 +08:00
parent c91dac1ab5
commit efc711775f
8 changed files with 12 additions and 2 deletions

View File

@ -7,6 +7,7 @@
#include "dialog_writesettings.h" #include "dialog_writesettings.h"
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
#include "app_cfg.h" #include "app_cfg.h"
#include <assert.h>
Dialog_Export::Dialog_Export(int total, const std::vector<int> &selectedIndexs, QWidget *parent) : Dialog_Export::Dialog_Export(int total, const std::vector<int> &selectedIndexs, QWidget *parent) :
QDialog(parent) QDialog(parent)

View File

@ -4,6 +4,7 @@
#include "imgfmt/HGPdf.h" #include "imgfmt/HGPdf.h"
#include "imgfmt/HGImgFmt.h" #include "imgfmt/HGImgFmt.h"
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
#include <assert.h>
Dialog_FullScreen::Dialog_FullScreen(class MainWindow *mainWidget, const QStringList &fileNames, int currIndex, int multiIndex) Dialog_FullScreen::Dialog_FullScreen(class MainWindow *mainWidget, const QStringList &fileNames, int currIndex, int multiIndex)
: QDialog(nullptr) : QDialog(nullptr)

View File

@ -2,6 +2,7 @@
#include "ui_dialog_imgproc_adjust.h" #include "ui_dialog_imgproc_adjust.h"
#include "imgproc/HGImgProc.h" #include "imgproc/HGImgProc.h"
#include "app_cfg.h" #include "app_cfg.h"
#include <assert.h>
Dialog_ImgProc_Adjust::Dialog_ImgProc_Adjust(HGImage img, QWidget *parent) : Dialog_ImgProc_Adjust::Dialog_ImgProc_Adjust(HGImage img, QWidget *parent) :
QDialog(parent), QDialog(parent),

View File

@ -3,6 +3,7 @@
#include "dialog_writesettings.h" #include "dialog_writesettings.h"
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
#include "app_cfg.h" #include "app_cfg.h"
#include <assert.h>
Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) : Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) :
QDialog(parent) QDialog(parent)

View File

@ -9,11 +9,13 @@
#include <QGraphicsView> #include <QGraphicsView>
#include <QDebug> #include <QDebug>
#include <qmath.h> #include <qmath.h>
#include <typeinfo>
#include <QWidget>
GraphicsTextEdit::GraphicsTextEdit(QWidget* parent) GraphicsTextEdit::GraphicsTextEdit(QWidget* parent)
: QTextEdit(parent) : QTextEdit(parent)
{ {
viewport()->setWindowFlag(Qt::FramelessWindowHint); viewport()->setWindowFlags(windowFlags() | Qt::FramelessWindowHint);
viewport()->setAttribute(Qt::WA_TranslucentBackground); viewport()->setAttribute(Qt::WA_TranslucentBackground);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

View File

@ -8,6 +8,7 @@
#include "HGString.h" #include "HGString.h"
#include "sane/sane_option_definitions.h" #include "sane/sane_option_definitions.h"
#include "dialog_input.h" #include "dialog_input.h"
#include <typeinfo>
std::string hg_settingdialog::property_combox_data_type_ = "combox_value_type"; std::string hg_settingdialog::property_combox_data_type_ = "combox_value_type";

View File

@ -39,6 +39,7 @@
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
#include "HGString.h" #include "HGString.h"
#include "app_cfg.h" #include "app_cfg.h"
#include <assert.h>
#define PASSWORD_KEY 4 #define PASSWORD_KEY 4
#define MY_URL_SCHEME "inscanner" #define MY_URL_SCHEME "inscanner"
@ -1844,7 +1845,7 @@ void MainWindow::on_act_imageInfo_triggered()
fileValues.append(info.completeBaseName());//add Filename fileValues.append(info.completeBaseName());//add Filename
fileValues.append(info.absoluteFilePath());//add Filepath fileValues.append(info.absoluteFilePath());//add Filepath
qint64 size_B = info.size(); qint64 size_B = info.size();
QDateTime c_date = info.birthTime(); QDateTime c_date = info.created();
QString createTime = c_date.toString("yyyy-MM-dd hh:mm:ss"); QString createTime = c_date.toString("yyyy-MM-dd hh:mm:ss");
fileValues.append(createTime);//add File created time fileValues.append(createTime);//add File created time
QDateTime m_date = info.lastModified(); QDateTime m_date = info.lastModified();

View File

@ -179,6 +179,7 @@
<Add option="-lopencv_imgproc" /> <Add option="-lopencv_imgproc" />
<Add option="-lopencv_core" /> <Add option="-lopencv_core" />
<Add option="-littnotify" /> <Add option="-littnotify" />
<Add option="-ltegra_hal" />
<Add option="-lzlib" /> <Add option="-lzlib" />
<Add option="-L../HGBase/bin/kylin_x86_64_Debug -lHGBase" /> <Add option="-L../HGBase/bin/kylin_x86_64_Debug -lHGBase" />
<Add option="-L../HGImgFmt/bin/kylin_x86_64_Debug -lHGImgFmt" /> <Add option="-L../HGImgFmt/bin/kylin_x86_64_Debug -lHGImgFmt" />
@ -206,6 +207,7 @@
<Add option="-lopencv_imgproc" /> <Add option="-lopencv_imgproc" />
<Add option="-lopencv_core" /> <Add option="-lopencv_core" />
<Add option="-littnotify" /> <Add option="-littnotify" />
<Add option="-ltegra_hal" />
<Add option="-lzlib" /> <Add option="-lzlib" />
<Add option="-L../../../../release/kylin/x86_64 -lHGBase -lHGImgFmt" /> <Add option="-L../../../../release/kylin/x86_64 -lHGBase -lHGImgFmt" />
<Add option="-ldl" /> <Add option="-ldl" />