-
Notifications
You must be signed in to change notification settings - Fork 60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: update cmake make ocr optional #128
base: master
Are you sure you want to change the base?
Conversation
等下,我只是--build了下,怎么翻译也变化了 libdraw使用源的,不要在项目里面放了 |
qtquick_compiler_add_resources(RCC_SOURCES ${RESOURCES}) |
这个我改过一部分了,#127 我们重复了 |
libdraw应该用pkgconfig,这个在代码里面的应该直接扔掉才对 |
libraw 本来就是用的系统的,你删除的不是不是 libraw 本体,应该是插件吧? |
哦,那我搞错了 |
Log: cmake and ocr optional
那我先等你那个合并咯,你的处理好点 |
ok, linuxdeepin/developer-center#3786 这个也要改,以后单独搞个 pr 吧 |
@@ -67,14 +69,15 @@ int main(int argc, char *argv[]) | |||
CursorTool *cursorTool = new CursorTool(); | |||
engine.rootContext()->setContextProperty("cursorTool", cursorTool); | |||
// OCR分析工具 | |||
#ifdef ENABLEOCR | |||
auto liveTextAnalyzer = new LiveTextAnalyzer; | |||
engine.rootContext()->setContextProperty("liveTextAnalyzer", liveTextAnalyzer); | |||
engine.addImageProvider(QLatin1String("liveTextAnalyzer"), liveTextAnalyzer); | |||
|
|||
engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml"))); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
main.qml 被包括进宏
@@ -8,15 +8,24 @@ set(CMAKE_AUTORCC ON) | |||
set(CMAKE_CXX_STANDARD 17) | |||
set(CMAKE_CXX_STANDARD_REQUIRED ON) | |||
|
|||
option(ENABLEOCR "Enable OCR" OFF) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
应该在 debian/rules 中加参数设置为 ON
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
建议先
review https://github.com/linuxdeepin/deepin-image-viewer/pull/127/files
这个是不完整的
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
修正文件权限等修改后面可以 rebase
TAG Bot New tag: 5.9.17 |
TAG Bot New tag: 6.0.4 |
TAG Bot New tag: 6.0.5 |
TAG Bot New tag: 6.0.6 |
TAG Bot New tag: 6.0.7 |
TAG Bot New tag: 6.0.8 |
TAG Bot New tag: 6.0.9 |
TAG Bot New tag: 6.0.10 |
Log: cmake and ocr optional
resolve: linuxdeepin/developer-center#3780