aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/coreplugin/images/inputfield.pngbin422 -> 379 bytes
-rw-r--r--src/plugins/coreplugin/images/inputfield_disabled.pngbin453 -> 379 bytes
-rw-r--r--src/plugins/coreplugin/manhattanstyle.cpp6
-rw-r--r--src/plugins/qt4projectmanager/qt4project.cpp5
4 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/images/inputfield.png b/src/plugins/coreplugin/images/inputfield.png
index 8020c8f731..40bdfc4a04 100644
--- a/src/plugins/coreplugin/images/inputfield.png
+++ b/src/plugins/coreplugin/images/inputfield.png
Binary files differ
diff --git a/src/plugins/coreplugin/images/inputfield_disabled.png b/src/plugins/coreplugin/images/inputfield_disabled.png
index c69f082f08..b713a59c8a 100644
--- a/src/plugins/coreplugin/images/inputfield_disabled.png
+++ b/src/plugins/coreplugin/images/inputfield_disabled.png
Binary files differ
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 30baacf78b..816c6d32d1 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -474,6 +474,12 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
case PE_PanelLineEdit:
{
painter->save();
+
+ // Fill the line edit background
+ QRect filledRect = option->rect.adjusted(1, 1, -1, -1);
+ painter->setBrushOrigin(filledRect.topLeft());
+ painter->fillRect(filledRect, option->palette.base());
+
if (option->state & State_Enabled)
drawCornerImage(d->lineeditImage, painter, option->rect, 2, 2, 2, 2);
else
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index b558b8770c..67bfa0cc55 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -923,11 +923,6 @@ QList<BuildConfigWidget*> Qt4Project::subConfigWidgets()
return subWidgets;
}
-/// **************************
-/// Qt4ProjectBuildConfigWidget
-/// **************************
-
-
void Qt4Project::collectApplicationProFiles(QList<Qt4ProFileNode *> &list, Qt4ProFileNode *node)
{
if (node->projectType() == Internal::ApplicationTemplate