diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-18 16:53:31 -0600 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-02-18 16:53:31 -0600 |
commit | beace242e6285922f0a42d0aa947755bb2c6e00b (patch) | |
tree | bb97f134fb9123536cb74cb56a551a64938c5016 /ui/qt5/horizonwizard.cc | |
parent | 4646086e4a621574227cce8aaf30b16803f302bf (diff) | |
download | horizon-beace242e6285922f0a42d0aa947755bb2c6e00b.tar.gz horizon-beace242e6285922f0a42d0aa947755bb2c6e00b.tar.bz2 horizon-beace242e6285922f0a42d0aa947755bb2c6e00b.tar.xz horizon-beace242e6285922f0a42d0aa947755bb2c6e00b.zip |
Qt UI: Build and run properly in the Runtime Env
Diffstat (limited to 'ui/qt5/horizonwizard.cc')
-rw-r--r-- | ui/qt5/horizonwizard.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index 862d2d6..818f631 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -66,7 +66,9 @@ static std::map<int, std::string> help_id_map = { #ifdef NON_LIBRE_FIRMWARE {HorizonWizard::Page_Firmware, "firmware"}, #endif /* NON_LIBRE_FIRMWARE */ +#ifdef HAS_INSTALL_ENV {HorizonWizard::Page_Partition, "partition"}, +#endif /* HAS_INSTALL_ENV */ {HorizonWizard::Page_PartitionDisk, "partition-disk"}, {HorizonWizard::Page_PartitionChoose, "partition-manipulation"}, {HorizonWizard::Page_PartitionManual, "partition-manual"}, @@ -211,7 +213,9 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) { #ifdef NON_LIBRE_FIRMWARE setPage(Page_Firmware, new FirmwarePage); #endif /* NON_LIBRE_FIRMWARE */ +#ifdef HAS_INSTALL_ENV setPage(Page_Partition, new PartitionPage); +#endif /* HAS_INSTALL_ENV */ setPage(Page_PartitionDisk, new PartitionDiskPage); setPage(Page_PartitionChoose, new PartitionChoicePage); setPage(Page_Network, new NetworkingPage); @@ -398,7 +402,7 @@ QString HorizonWizard::toHScript() { break; } - if(chosen_disk.empty()) { + if(chosen_disk.empty() || !auto_part) { lines << part_lines; } else { /* XXX TODO: examples for thoughts on auto-partition setups are in |