From bcf842e04c20e92f9ea2258f796c5d8788d5cb59 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 16 Mar 2012 12:25:24 +0100 Subject: Include geometric variants when bootstrapping. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are needed by the qdbus tools. Change-Id: Ia1994f6a9bfa2ce1d526fd3e49370fd188ce5972 Reviewed-by: Jędrzej Nowacki Reviewed-by: Thiago Macieira --- src/tools/bootstrap/bootstrap.pri | 1 - src/tools/bootstrap/bootstrap.pro | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 228fcaca0d..0942e5529e 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -14,7 +14,6 @@ DEFINES += \ QT_NO_CAST_TO_ASCII \ QT_NO_CODECS \ QT_NO_DATASTREAM \ - QT_NO_GEOM_VARIANT \ QT_NO_LIBRARY \ QT_NO_QOBJECT \ QT_NO_STL \ diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 9c34c758d7..813882b6f6 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -17,7 +17,6 @@ DEFINES += \ QT_NO_CAST_TO_ASCII \ QT_NO_CODECS \ QT_NO_DATASTREAM \ - QT_NO_GEOM_VARIANT \ QT_NO_LIBRARY \ QT_NO_QOBJECT \ QT_NO_STL \ @@ -81,6 +80,10 @@ SOURCES += \ ../../corelib/tools/qlocale_tools.cpp \ ../../corelib/tools/qmap.cpp \ ../../corelib/tools/qregexp.cpp \ + ../../corelib/tools/qpoint.cpp \ + ../../corelib/tools/qrect.cpp \ + ../../corelib/tools/qsize.cpp \ + ../../corelib/tools/qline.cpp \ ../../corelib/tools/qstring.cpp \ ../../corelib/tools/qstringlist.cpp \ ../../corelib/tools/qvector.cpp \ -- cgit v1.2.3