From 1278b3cb8a2ca926ffb2a0919d8646d0f5d9f320 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 7 Dec 2012 12:39:12 +0100 Subject: [PATCH] Remove QT_DLL and QT_NODLL defines. Task-number: QTBUG-28044 Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt.prf | 5 ----- src/widgets/widgets/qmenu_wince.rc | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 0735ec465c..30bbae7c64 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -2,17 +2,12 @@ CONFIG *= thread #handle defines win32 { - # ### QT_NODLL and QT_DLL are compatibility, remove before the Qt 5.0 release contains(QT_CONFIG, shared) { - DEFINES += QT_DLL - # this variable is read by qmake in qmake/generators/win32/msvc_vcproj.cpp # function VcprojGenerator::initDeploymentTool(), which contains some hardcoded # library names (the ones that were static in Qt 4) # it probably doesn't work anymore and should not be in this file QMAKE_QT_DLL = 1 - } else { - DEFINES += QT_NODLL } } CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG diff --git a/src/widgets/widgets/qmenu_wince.rc b/src/widgets/widgets/qmenu_wince.rc index 50624eef57..631cd9d47a 100644 --- a/src/widgets/widgets/qmenu_wince.rc +++ b/src/widgets/widgets/qmenu_wince.rc @@ -3,9 +3,9 @@ #include #include "winuser.h" -#if defined (_DEBUG) && defined(QT_DLL) +#if defined (_DEBUG) && defined(QT_SHARED) #include "Qt5Widgetsd_resource.rc" -#elif defined(QT_DLL) +#elif defined(QT_SHARED) #include "Qt5Widgets_resource.rc" #endif