-
Notifications
You must be signed in to change notification settings - Fork 86
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
feat: allow skip including headers of annootations #394
feat: allow skip including headers of annootations #394
Conversation
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
1689a9a
to
b4ebb40
Compare
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
commit message里面有typo |
b4ebb40
to
29123e8
Compare
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
29123e8
to
9ac28fb
Compare
/+1 |
for (const QString &annotation : annotations) { | ||
if (annotation.indexOf('<') == -1) { | ||
hs << "#include \"types/" << annotation.toLower() << ".h\"" << endl; | ||
if (!skipIncludeAnnotations) { |
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.
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.
下面是处理类型,这里需要跳过的是处理include,下面是原本没有fix的工具的逻辑
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.
include都跳过了,类型处理不跳过么?会不会出现类型不识别的问题,
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.
qt的工具是要求所有类型都放在-I的头文件的,我们为了方便把类型分开成各个头文件了
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.
这个命名可以改一下,其它没有问题
cmake/DtkTools/DtkDBusMacros.cmake
Outdated
@@ -33,6 +33,11 @@ function(dtk_add_dbus_interface _sources _interface _relativename) | |||
set(_params -m) | |||
endif() | |||
|
|||
get_source_file_property(_skipincludeannotations ${_interface} SKIP_INCLUDEANNOTATIONS) |
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.
SKIP_INCLUDE_ANNOTATIONS
6cc2e54
to
bd75921
Compare
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
如果想要应用新的workflow文件,需要重新force-push一下,等workflow准备好之后force-push一下吧 |
bd75921
to
0b6ad6c
Compare
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#394
Doc Check bot |
@zccrs 已经改好了 |
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: Decodetalkers, zccrs The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Log:
Issue: linuxdeepin/dtk#147