diff options
| -rw-r--r-- | changelogs/changes-1.10.1.md | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/CppModule.qbs | 24 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/UnixGCC.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-mingw.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 3 |
5 files changed, 13 insertions, 21 deletions
diff --git a/changelogs/changes-1.10.1.md b/changelogs/changes-1.10.1.md index ffcf8c9e1..21862d533 100644 --- a/changelogs/changes-1.10.1.md +++ b/changelogs/changes-1.10.1.md @@ -1,7 +1,7 @@ # Important bugfixes * Fix crash when the "original" value is misused (QBS-1255). * Fix qtquickcompiler support for qml files in subdirectories (QBS-1261). -* Fix GCC support for "bare metal" systems (QBS-1263). +* Fix GCC support for "bare metal" systems (QBS-1263, QBS-1265). * Fix using ids in Depends items (QBS-1264). * Fix race condition when creating Inno Setup, NSIS, or WiX installers. * Fix release builds for Android with NDK r12 and above (QBS-1256). diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index 03155ed58..3910930de 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -165,24 +165,24 @@ 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 property stringList frameworks // list of frameworks, will be linked with '-framework <name>' property stringList weakFrameworks // list of weakly-linked frameworks, will be linked with '-weak_framework <name>' property stringList rpaths - property string sonamePrefix + property string sonamePrefix: "" property bool useRPaths: true property bool useRPathLink property string rpathLinkFlag diff --git a/share/qbs/modules/cpp/UnixGCC.qbs b/share/qbs/modules/cpp/UnixGCC.qbs index 491cf74af..8b1228b99 100644 --- a/share/qbs/modules/cpp/UnixGCC.qbs +++ b/share/qbs/modules/cpp/UnixGCC.qbs @@ -38,11 +38,8 @@ GenericGCC { staticLibraryPrefix: "lib" dynamicLibraryPrefix: "lib" loadableModulePrefix: "lib" - executablePrefix: "" staticLibrarySuffix: ".a" dynamicLibrarySuffix: ".so" - loadableModuleSuffix: "" - executableSuffix: "" debugInfoSuffix: ".debug" imageFormat: "elf" systemRunPaths: ["/lib", "/usr/lib"] diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs index 4ef2ea552..8b16105a2 100644 --- a/share/qbs/modules/cpp/windows-mingw.qbs +++ b/share/qbs/modules/cpp/windows-mingw.qbs @@ -39,8 +39,6 @@ GenericGCC { qbs.toolchain && qbs.toolchain.contains("mingw") priority: 0 staticLibraryPrefix: "lib" - dynamicLibraryPrefix: "" - executablePrefix: "" staticLibrarySuffix: ".a" dynamicLibrarySuffix: ".dll" executableSuffix: ".exe" diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index b7e88b6b2..957bb0e32 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -110,9 +110,6 @@ CppModule { : undefined architecture: qbs.architecture endianness: "little" - staticLibraryPrefix: "" - dynamicLibraryPrefix: "" - executablePrefix: "" staticLibrarySuffix: ".lib" dynamicLibrarySuffix: ".dll" executableSuffix: ".exe" |