From fd87383c415ef8879c1a8e56ddd83880d582fb41 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 9 Jul 2012 16:10:37 +0200 Subject: [PATCH] remove pointless checking/fallback code for $$TARGET qmake always sets that variable, so unless somebody pro-actively screws it up (which doesn't seem like being worth checking for), it will just work. Change-Id: I3c4ada47cbd34ac68695d8efbf09c605392616f5 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_module_config.prf | 1 - mkspecs/features/qt_tool.prf | 1 - 2 files changed, 2 deletions(-) diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 67db2093bd..a05da5f49e 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -9,7 +9,6 @@ load(qt_build_config) # loads qmodule.pri if hasn't been loaded already isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) -isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") isEmpty(VERSION):VERSION = $$QT_VERSION # Compile as shared/DLL or static according to the option given to configure diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 48ce5b903b..69a303fcac 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -15,7 +15,6 @@ INSTALLS += target # qtPrepareTool() to work with the non-installed build. !build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache) { - isEmpty(TARGET):TARGET = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(MODULE):MODULE = $$TARGET MODULE_DEPENDS = $$replace(QT, -private$, )