Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

2 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
index 7d7453b..00ebed0 100644
--- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -1050,7 +1050,6 @@ void tst_QDoubleSpinBox::taskQTBUG_5008_textFromValueAndValidate()
 {
     class DecoratedSpinBox : public QDoubleSpinBox
     {
-        friend class tst_QDoubleSpinBox;
     public:
         DecoratedSpinBox()
         {
@@ -1064,6 +1063,8 @@ void tst_QDoubleSpinBox::taskQTBUG_5008_textFromValueAndValidate()
         { 
             return locale().toString(value);
         }
+
+        using QDoubleSpinBox::lineEdit;
     } spinbox;
     spinbox.show();
     spinbox.activateWindow();
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp
index d2fe2ac..655de15 100644
--- a/tests/auto/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/qspinbox/tst_qspinbox.cpp
@@ -1010,7 +1010,6 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate()
 {
     class DecoratedSpinBox : public QSpinBox
     {
-        friend class tst_QSpinBox;
     public:
         DecoratedSpinBox()
         {
@@ -1024,6 +1023,8 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate()
         { 
             return locale().toString(value);
         }
+
+        using QSpinBox::lineEdit;
     } spinbox;
     spinbox.show();
     spinbox.activateWindow();