From 28560dc39d75eb446ad1b7fcfd9457cb0c3d4efc Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Wed, 11 Jan 2012 13:12:55 +0100
Subject: [PATCH] Tweak import layout on TargetSetupPage
Expand the import path line edit.
Change-Id: Iaa7bfd5308a2d94be9adef761499c16d918cc63d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
src/plugins/qt4projectmanager/qt4target.cpp | 6 +++++-
src/plugins/qt4projectmanager/qt4target.h | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 54ce9024800..6d55bb50f58 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -513,6 +513,7 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f
m_importLinePath = new Utils::PathChooser();
m_importLinePath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_importLinePath->setPath(sourceDir);
+ m_importLinePath->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_importLineLayout->addWidget(m_importLinePath);
m_importLineButton = new QPushButton;
@@ -521,7 +522,8 @@ Qt4DefaultTargetSetupWidget::Qt4DefaultTargetSetupWidget(Qt4BaseTargetFactory *f
// make it in line with import path chooser button on mac
m_importLineButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
m_importLineLayout->addWidget(m_importLineButton);
- m_importLineLayout->addStretch();
+ m_importLineStretch = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed);
+ m_importLineLayout->addSpacerItem(m_importLineStretch);
layout->addWidget(w);
m_importLineLabel->setVisible(false);
@@ -771,6 +773,8 @@ void Qt4DefaultTargetSetupWidget::addImportClicked()
m_importLineLabel->setVisible(true);
m_importLinePath->setVisible(true);
m_importLineButton->setAttribute(Qt::WA_MacNormalSize);
+ m_importLineStretch->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+ m_importLineLayout->invalidate();
return;
}
QList<BuildConfigurationInfo> infos = BuildConfigurationInfo::checkForBuild(m_importLinePath->path(), m_proFilePath);
diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h
index 64f2c604a99..fefbb48b324 100644
--- a/src/plugins/qt4projectmanager/qt4target.h
+++ b/src/plugins/qt4projectmanager/qt4target.h
@@ -39,6 +39,8 @@
#include <projectexplorer/target.h>
#include <projectexplorer/task.h>
+#include <QtGui/QSpacerItem>
+
namespace Utils {
class DetailsWidget;
class PathChooser;
@@ -177,6 +179,7 @@ private:
QLabel *m_importLineLabel;
Utils::PathChooser *m_importLinePath;
QPushButton *m_importLineButton;
+ QSpacerItem *m_importLineStretch;
void setupWidgets();
void clearWidgets();
--
GitLab