diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-02 09:46:41 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-02 09:57:13 +0200 |
| commit | e89721bce16d6486e47b5b88d24467face5a11aa (patch) | |
| tree | 268bad4a296f3dd02c83d1735fd7b76be38623d8 /src/sdk | |
| parent | d5b02dd37312ee9a9682caff9fae925c04323e8f (diff) | |
Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/sdk')
| -rw-r--r-- | src/sdk/sdk.pro | 14 | ||||
| -rw-r--r-- | src/sdk/settingsdialog.cpp | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index e75fbe3c2..3cbc0347e 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -4,16 +4,12 @@ TARGET = installerbase include(../../installerfw.pri) -QT += network script xml - -isEqual(QT_MAJOR_VERSION, 5) { - QT += widgets - # add the minimal plugin in static case to be able to start the installer - # headless with: installer-binary -platform minimal - # using QT += qpa_minimal_plugin would result in a minimal only compiled version - !win32:CONFIG(static, static|shared) { +QT += network script xml widgets +# add the minimal plugin in static build to be able to start the installer headless with: +# installer-binary -platform minimal +# using QT += qpa_minimal_plugin would result in a minimal only compiled version +!win32:CONFIG(static, static|shared) { QTPLUGIN += qminimal - } } DESTDIR = $$IFW_APP_PATH diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp index 305fc051a..8bbddfe3b 100644 --- a/src/sdk/settingsdialog.cpp +++ b/src/sdk/settingsdialog.cpp @@ -428,13 +428,8 @@ void SettingsDialog::setupRepositoriesTreeWidget() for (int i = 0; i < treeWidget->model()->columnCount(); ++i) treeWidget->resizeColumnToContents(i); -#if QT_VERSION < 0x050000 - treeWidget->header()->setResizeMode(0, QHeaderView::Fixed); - treeWidget->header()->setResizeMode(1, QHeaderView::Fixed); -#else treeWidget->header()->setSectionResizeMode(0, QHeaderView::Fixed); treeWidget->header()->setSectionResizeMode(1, QHeaderView::Fixed); -#endif treeWidget->header()->setMinimumSectionSize(treeWidget->columnWidth(1)); treeWidget->setItemDelegateForColumn(0, new PasswordDelegate(treeWidget)); |