diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-18 13:53:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 15:22:55 +0100 |
| commit | 67f20d66e4f8895492fad0944403a4947263ec5a (patch) | |
| tree | 88288292eaac884fe73110ddd53751c4ed010b31 | |
| parent | 218179ce2febc54d0fbcee388c810b592a4820cd (diff) | |
remove pointless conditionals and expansions from qtLibraryTarget()
this function is called only from library TEMPLATEs, and always with
exactly one word as the only argument.
Change-Id: I6282e3826791f89e6cf89dde625c8166e4e56028
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index bac7ca1751..055be775f1 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -19,10 +19,7 @@ defineReplace(qtLibraryTarget) { MAJOR_VERSION = $$section(VERSION, ., 0, 0) LIBRARY_NAME ~= s,^Qt,Qt$$MAJOR_VERSION, } - unset(LIBRARY_SUFFIX) - contains(TEMPLATE, .*lib):LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() - isEmpty(LIBRARY_SUFFIX):return($$LIBRARY_NAME) - else:return($$member(LIBRARY_NAME, 0)$$LIBRARY_SUFFIX) + return($$LIBRARY_NAME$$qtPlatformTargetSuffix()) } defineTest(qtAddLibrary) { |