feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: - Some layouting issues

Browse Source
This commit is contained in:
con
2009-01-28 17:38:41 +01:00
parent 8c773beb45
commit 0f5de365b9
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/pathchooser.cpp
View File

@@ -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(textChanged(QString)), this, SIGNAL(changed()));
connect(m_d->m_lineEdit, SIGNAL(validChanged()), this, SIGNAL(validChanged())); 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->addWidget(m_d->m_lineEdit);
hLayout->setSizeConstraint(QLayout::SetMinimumSize); hLayout->setSizeConstraint(QLayout::SetMinimumSize);

4
src/shared/qrceditor/qrceditor.cpp
View File

@@ -39,7 +39,7 @@
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
namespace SharedTools { using namespace SharedTools;
QrcEditor::QrcEditor(QWidget *parent) QrcEditor::QrcEditor(QWidget *parent)
: QWidget(parent), : QWidget(parent),
@@ -405,5 +405,3 @@ void QrcEditor::onRedo()
updateCurrent(); updateCurrent();
updateHistoryControls(); updateHistoryControls();
} }
} // namespace SharedTools

10
src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
View File

@@ -9,7 +9,7 @@ SOURCES = customwidgets.cpp
# Link against the qtcreator utils lib # Link against the qtcreator utils lib
unix { linux-* {
# form abs path to qtcreator lib dir # form abs path to qtcreator lib dir
GH_LIB=$$dirname(PWD) GH_LIB=$$dirname(PWD)
GH_LIB=$$dirname(GH_LIB) GH_LIB=$$dirname(GH_LIB)
@@ -19,7 +19,13 @@ unix {
} }
INCLUDEPATH += ../../../src/libs 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 DESTDIR= $$[QT_INSTALL_PLUGINS]/designer