Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Tusooa Zhu
Krita
Commits
29580a00
Commit
29580a00
authored
Nov 07, 2015
by
Halla Rempt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a naming conflict with calligra
parent
e9fd1a66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
libs/basicflakes/plugin/CMakeLists.txt
libs/basicflakes/plugin/CMakeLists.txt
+4
-4
libs/basicflakes/plugin/Plugin.cpp
libs/basicflakes/plugin/Plugin.cpp
+1
-1
libs/basicflakes/plugin/krita_tool_basicflakes.desktop
libs/basicflakes/plugin/krita_tool_basicflakes.desktop
+0
-0
No files found.
libs/basicflakes/plugin/CMakeLists.txt
View file @
29580a00
...
...
@@ -16,7 +16,7 @@ set ( basicflakesplugin_SRCS
ki18n_wrap_ui
(
basicflakesplugin_SRCS
)
add_library
(
calligr
a_tool_basicflakes MODULE
${
basicflakesplugin_SRCS
}
)
kcoreaddons_desktop_to_json
(
calligr
a_tool_basicflakes
calligr
a_tool_basicflakes.desktop
)
target_link_libraries
(
calligr
a_tool_basicflakes kritaflake kritabasicflakes
)
install
(
TARGETS
calligr
a_tool_basicflakes DESTINATION
${
CALLIGRA_PLUGIN_INSTALL_DIR
}
)
add_library
(
krit
a_tool_basicflakes MODULE
${
basicflakesplugin_SRCS
}
)
kcoreaddons_desktop_to_json
(
krit
a_tool_basicflakes
krit
a_tool_basicflakes.desktop
)
target_link_libraries
(
krit
a_tool_basicflakes kritaflake kritabasicflakes
)
install
(
TARGETS
krit
a_tool_basicflakes DESTINATION
${
CALLIGRA_PLUGIN_INSTALL_DIR
}
)
libs/basicflakes/plugin/Plugin.cpp
View file @
29580a00
...
...
@@ -25,7 +25,7 @@
#include <kpluginfactory.h>
K_PLUGIN_FACTORY_WITH_JSON
(
PluginFactory
,
"
calligr
a_tool_basicflakes.json"
,
K_PLUGIN_FACTORY_WITH_JSON
(
PluginFactory
,
"
krit
a_tool_basicflakes.json"
,
registerPlugin
<
Plugin
>
();)
Plugin
::
Plugin
(
QObject
*
parent
,
const
QVariantList
&
)
...
...
libs/basicflakes/plugin/
calligr
a_tool_basicflakes.desktop
→
libs/basicflakes/plugin/
krit
a_tool_basicflakes.desktop
View file @
29580a00
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment