projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Remove all code supporting Qt < 5.5 and KDE4
[quassel.git]
/
src
/
qtui
/
coreconfigwizard.cpp
diff --git
a/src/qtui/coreconfigwizard.cpp
b/src/qtui/coreconfigwizard.cpp
index
8225fe4
..
ebb23b8
100644
(file)
--- a/
src/qtui/coreconfigwizard.cpp
+++ b/
src/qtui/coreconfigwizard.cpp
@@
-318,11
+318,7
@@
AuthenticationSelectionPage::AuthenticationSelectionPage(const QVariantList &aut
setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
-#if QT_VERSION >= 0x050200
sp.setRetainSizeWhenHidden(true);
sp.setRetainSizeWhenHidden(true);
-#else
- ui.authSettingsStack->setVisible(true); // ugly hack that will show an empty box, but we'll deprecate Qt4 soon anyway
-#endif
ui.descriptionStack->setSizePolicy(sp);
ui.authSettingsStack->setSizePolicy(sp);
ui.descriptionStack->setSizePolicy(sp);
ui.authSettingsStack->setSizePolicy(sp);
@@
-347,11
+343,7
@@
QString AuthenticationSelectionPage::displayName() const
QString AuthenticationSelectionPage::authenticator() const
{
QString AuthenticationSelectionPage::authenticator() const
{
-#if QT_VERSION >= 0x050200
return ui.backendList->currentData().toString();
return ui.backendList->currentData().toString();
-#else
- return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
-#endif
}
}
@@
-424,11
+416,7
@@
StorageSelectionPage::StorageSelectionPage(const QVariantList &backendInfos, QWi
setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
setSizePolicy({QSizePolicy::Fixed, QSizePolicy::Fixed});
QSizePolicy sp{QSizePolicy::MinimumExpanding, QSizePolicy::Fixed};
-#if QT_VERSION >= 0x050200
sp.setRetainSizeWhenHidden(true);
sp.setRetainSizeWhenHidden(true);
-#else
- ui.storageSettingsStack->setVisible(true); // ugly hack that will show an empty box, but we'll deprecate Qt4 soon anyway
-#endif
ui.descriptionStack->setSizePolicy(sp);
ui.storageSettingsStack->setSizePolicy(sp);
ui.descriptionStack->setSizePolicy(sp);
ui.storageSettingsStack->setSizePolicy(sp);
@@
-453,11
+441,7
@@
QString StorageSelectionPage::displayName() const
QString StorageSelectionPage::backend() const
{
QString StorageSelectionPage::backend() const
{
-#if QT_VERSION >= 0x050200
return ui.backendList->currentData().toString();
return ui.backendList->currentData().toString();
-#else
- return ui.backendList->itemData(ui.backendList->currentIndex()).toString();
-#endif
}
}