From 824a395c03ce8054931405b9b5bb361c44cb9c61 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Tue, 19 May 2015 17:03:23 +0200
Subject: [PATCH] manually merge 71d93a4 of PR#2016

---
 src/app/qgisapp.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index e9796ffa00c3..46c57b3fd64b 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -1827,8 +1827,6 @@ void QgisApp::createStatusBar()
   // so we need to set font for it separately
   mScaleEdit->lineEdit()->setFont( myFont );
   mScaleEdit->setMinimumWidth( 10 );
-  mScaleEdit->setMaximumWidth( 100 );
-  //mScaleEdit->setMaximumHeight( 20 );
   mScaleEdit->setContentsMargins( 0, 0, 0, 0 );
   mScaleEdit->setWhatsThis( tr( "Displays the current map scale" ) );
   mScaleEdit->setToolTip( tr( "Current map scale (formatted as x:y)" ) );