forked from qt-creator/qt-creator
Fixes: - Some layouting issues
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user