From 7395e6abc6bdea324acf178919500bf377073455 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 30 May 2012 13:03:56 +0200
Subject: 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/qmake.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qmake/qmake.pri')

diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 68b78f8d21..bbeb899c80 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -33,7 +33,7 @@ contains(QT_EDITION, OpenSource) {
 }
 
 bootstrap { #Qt code
-   DEFINES+=QT_NODLL QT_NO_THREAD
+   DEFINES+=QT_NO_THREAD
    SOURCES+= \
         qbitarray.cpp \
         qbuffer.cpp \
-- 
cgit v1.2.3