whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify/fix QT_BOOTSTRAPPED-related #ifdefs 

don't test for building specific tools when we actually only want to
know whether we are bootstrapping. so far, this was only redundant; with
the upcoming change of not bootstrapping unnecessarily it would be
outright broken.

Change-Id: I7600d8ebb14a4194640c50035e35a04263f2ccce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2013-03-12 19:38:01 +01:00 committed by The Qt Project
parent bd7ca33889
commit 096e32d814
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qcore_mac_p.h
View File

@ -57,7 +57,7 @@
# define __IMAGECAPTURE__
#endif
#if defined(QT_BUILD_QMAKE) || defined(QT_BOOTSTRAPPED)
#if defined(QT_BOOTSTRAPPED)
#include <ApplicationServices/ApplicationServices.h>
#else
#include <CoreFoundation/CoreFoundation.h>

2
src/corelib/thread/qbasicatomic.h
View File

@ -44,7 +44,7 @@
#ifndef QBASICATOMIC_H
#define QBASICATOMIC_H
#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_RCC) || defined(QT_UIC) || defined(QT_BOOTSTRAPPED)
#if defined(QT_BOOTSTRAPPED)
# include <QtCore/qatomic_bootstrap.h>
// Compiler dependent implementation