AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QT_DLL and QT_NODLL defines.

Browse Source 
Task-number: QTBUG-28044

Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Stephen Kelly 2012-12-07 12:39:12 +01:00 committed by The Qt Project
parent 3e7e61f856
commit 1278b3cb8a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/qt.prf
View File

@ -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

4
src/widgets/widgets/qmenu_wince.rc
View File

@ -3,9 +3,9 @@
#include <commctrl.h>
#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