Clean up the use of QT_NODLL
authorThiago Macieira <thiago.macieira@intel.com>
Wed, 30 May 2012 11:03:56 +0000 (13:03 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 28 Jun 2012 04:21:52 +0000 (06:21 +0200)
commit7395e6abc6bdea324acf178919500bf377073455
treeb36804666e8960a0f3760a854bf7b81140fa3078
parent96166fa56abb52157387c4911efbd4e5e6beee93
Clean up the use of QT_NODLL

QT_NODLL is replaced by QT_STATIC, but the latter is implied if
QT_BOOTSTRAPPED is already defined. Therefore, simply remove the
QT_NODLL definitions.

Change-Id: Iac7ec0b494b7a78197c25d59547f45eaf92d7465
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/qmake.pri
src/tools/bootstrap/bootstrap.pri
src/tools/bootstrap/bootstrap.pro
tools/configure/Makefile.mingw
tools/configure/Makefile.win32
tools/configure/configure.pro