diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 0f83cf1c4cbdfbcfbf025f90e70276ef67c5a5ed..2555399a422b78009760a5f659405e7f2e0e9f4a 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 a353d73839496d20f4368e746b68a1b345a9656c..bd25a42d7427ab3f576158bd942781fbcb5990e1 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 6923e09837dd649062416ec29198c599a8564670..ce209c86d7709b69b28f4ee9a029cbbfa32a49ff 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