From 0f5de365b9a05efb85d89b82a115c1a20c99a852 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 28 Jan 2009 17:38:41 +0100
Subject: [PATCH] Fixes: - Some layouting issues
---
src/libs/utils/pathchooser.cpp | 2 +-
src/shared/qrceditor/qrceditor.cpp | 4 +---
src/tools/qtcreatorwidgets/qtcreatorwidgets.pro | 10 ++++++++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 0f83cf1c4cb..2555399a422 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -110,7 +110,7 @@ PathChooser::PathChooser(QWidget *parent) :
connect(m_d->m_lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(changed()));
connect(m_d->m_lineEdit, SIGNAL(validChanged()), this, SIGNAL(validChanged()));
- m_d->m_lineEdit->setMinimumWidth(260);
+ m_d->m_lineEdit->setMinimumWidth(200);
hLayout->addWidget(m_d->m_lineEdit);
hLayout->setSizeConstraint(QLayout::SetMinimumSize);
diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp
index a353d738394..bd25a42d742 100644
--- a/src/shared/qrceditor/qrceditor.cpp
+++ b/src/shared/qrceditor/qrceditor.cpp
@@ -39,7 +39,7 @@
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
-namespace SharedTools {
+using namespace SharedTools;
QrcEditor::QrcEditor(QWidget *parent)
: QWidget(parent),
@@ -405,5 +405,3 @@ void QrcEditor::onRedo()
updateCurrent();
updateHistoryControls();
}
-
-} // namespace SharedTools
diff --git a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
index 6923e09837d..ce209c86d77 100644
--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -9,7 +9,7 @@ SOURCES = customwidgets.cpp
# Link against the qtcreator utils lib
-unix {
+linux-* {
# form abs path to qtcreator lib dir
GH_LIB=$$dirname(PWD)
GH_LIB=$$dirname(GH_LIB)
@@ -19,7 +19,13 @@ unix {
}
INCLUDEPATH += ../../../src/libs
-LIBS += -L../../../lib -lUtils
+macx {
+ LIBS += -L../../../bin/QtCreator.app/Contents/PlugIns
+ CONFIG(debug, debug|release):LIBS += -lUtils_debug
+ else:LIBS += -lUtils
+} else {
+ LIBS += -L../../../lib -lUtils
+}
DESTDIR= $$[QT_INSTALL_PLUGINS]/designer
--
GitLab