Commit 2e81773c authored by Christian Kandeler's avatar Christian Kandeler Committed by Joerg Bornemann
Browse files

Fix merge artifact in qbs file.

Change-Id: I1c30c49bc3e5d000a97591e300f23fe55698adfe
Reviewed-by: default avatarJoerg Bornemann <>
parent e4114505
import qbs.base 1.0
import "../../../../qbs/defaults.js" as Defaults
DynamicLibrary {
name: "styleplugin"
......@@ -7,7 +8,7 @@ DynamicLibrary {
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] }
cpp.defines: project.additionalCppDefines
cpp.defines: Defaults.defines(qbs)
files: [
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment