diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-22 11:27:55 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-22 11:27:55 +0100 |
| commit | 4dfff1d19b60adcc22405a1b525eb331960f1d28 (patch) | |
| tree | 29d5d1063860e7725cb159e0c5fc29fb76c02b91 /share/qbs/modules/cpp/CppModule.qbs | |
| parent | e79281b26b1251e608feca121b5f08a37126a3e3 (diff) | |
| parent | 7862e87dc3ed3f7e2e6c8de936d6e15e914a02a4 (diff) | |
| download | qbs-4dfff1d19b60adcc22405a1b525eb331960f1d28.tar.gz | |
Merge 1.10 into master
Change-Id: Iecddc2722d22d7c15d4b32efd676fa8e7c00e99f
Diffstat (limited to 'share/qbs/modules/cpp/CppModule.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 17cfb4905..dc175e875 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -167,17 +167,17 @@ Module { property string linkerName property string linkerPath: linkerName property stringList linkerWrapper - property string staticLibraryPrefix - property string dynamicLibraryPrefix - property string loadableModulePrefix - property string executablePrefix - property string staticLibrarySuffix - property string dynamicLibrarySuffix - property string loadableModuleSuffix - property string executableSuffix - property string debugInfoSuffix - property string debugInfoBundleSuffix - property string variantSuffix + property string staticLibraryPrefix: "" + property string dynamicLibraryPrefix: "" + property string loadableModulePrefix: "" + property string executablePrefix: "" + property string staticLibrarySuffix: "" + property string dynamicLibrarySuffix: "" + property string loadableModuleSuffix: "" + property string executableSuffix: "" + property string debugInfoSuffix: "" + property string debugInfoBundleSuffix: "" + property string variantSuffix: "" property bool createSymlinks: true property stringList dynamicLibraries // list of names, will be linked with -lname property stringList staticLibraries // list of static library files @@ -185,7 +185,7 @@ Module { property stringList weakFrameworks // list of weakly-linked frameworks, will be linked with '-weak_framework <name>' property string rpathOrigin property stringList rpaths - property string sonamePrefix + property string sonamePrefix: "" property bool useRPaths: true property bool useRPathLink property string rpathLinkFlag |