From 1c31ff98a06a4a46ecb32b4c7b8304296a1bd8c5 Mon Sep 17 00:00:00 2001 From: kh1 <qt-info@nokia.com> Date: Wed, 7 Apr 2010 17:32:02 +0200 Subject: [PATCH] Fix "broken" qmake call on OSX for maemo. Tested on OSX, otherwise qmake will automatically append -macx which results in Makefiles containing references to the host Qt libraries, e.g. -lQtCore_debug etc... Reviewed-by: dt --- src/plugins/qt4projectmanager/qmakestep.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 45b3c435b9b..ff7e4edca14 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -106,7 +106,7 @@ QStringList QMakeStep::allArguments() if (!additonalArguments.contains("-spec")) arguments << "-spec" << bc->qtVersion()->mkspec(); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_OS_MAC) ToolChain::ToolChainType type = bc->toolChainType(); if (type == ToolChain::GCC_MAEMO) arguments << QLatin1String("-unix"); -- GitLab