[locale] Repair test: don't re-init te occupied-pixels set each loop

- while here, merge Tests.h to the cpp file
- Fix build when debugging timezones (missed during earlier refactor)
This commit is contained in:
Adriaan de Groot 2020-08-06 12:14:15 +02:00
parent 21f97db8fd
commit 04e53be934
3 changed files with 28 additions and 49 deletions

View file

@ -368,7 +368,7 @@ getAdjustLiveTimezone( const QVariantMap& configurationMap, bool& adjustLiveTime
adjustLiveTimezone = CalamaresUtils::getBool(
configurationMap, "adjustLiveTimezone", Calamares::Settings::instance()->doChroot() );
#ifdef DEBUG_TIMEZONES
if ( m_adjustLiveTimezone )
if ( adjustLiveTimezone )
{
cWarning() << "Turning off live-timezone adjustments because debugging is on.";
adjustLiveTimezone = false;