diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py
index 6a662b7b0ad..9d0b4c7f44d 100644
--- a/share/qtcreator/dumper/qttypes.py
+++ b/share/qtcreator/dumper/qttypes.py
@@ -2086,6 +2086,16 @@ def qdump____gnu_cxx__hash_set(d, value):
 #
 #######################################################################
 
+def qdump__boost__bimaps__bimap(d, value):
+    leftType = templateArgument(value.type, 0)
+    rightType = templateArgument(value.type, 1)
+    size = value["core"]["node_count"]
+    d.putItemCount(size)
+    d.putNumChild(size)
+    #if d.isExpanded():
+    d.putPlainChildren(value)
+
+
 def qdump__boost__optional(d, value):
     if value["m_initialized"] == False:
         d.putValue("<uninitialized>")
@@ -2099,6 +2109,7 @@ def qdump__boost__optional(d, value):
         else:
             d.putItem(storage.cast(type))
 
+
 def qdump__boost__shared_ptr(d, value):
     # s                  boost::shared_ptr<int>
     #    pn              boost::detail::shared_count
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 23053436269..15db1df395a 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -206,6 +206,7 @@ void dummyStatement(...) {}
 #include <boost/date_time.hpp>
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/bimap.hpp>
 #endif
 
 #if USE_EIGEN
@@ -5275,6 +5276,24 @@ namespace boost {
         dummyStatement(&d1, &d2, &d3);
     }
 
+    void testBoostBimap()
+    {
+        typedef boost::bimap<int, int> B;
+        B b;
+        BREAK_HERE;
+        // Check b <0 items> boost::B.
+        // Continue.
+        b.left.insert(B::left_value_type(1, 2));
+        BREAK_HERE;
+        // Check b <1 items> boost::B.
+        // Continue.
+        B::left_const_iterator it = b.left.begin();
+        int l = it->first;
+        int r = it->second;
+        // Continue.
+        dummyStatement(&b, &l, &r);
+    }
+
     void testBoostPosixTimePtime()
     {
         using namespace boost;
@@ -5303,6 +5322,7 @@ namespace boost {
         testBoostPosixTimeTimeDuration();
         testBoostPosixTimePtime();
         testBoostGregorianDate();
+        testBoostBimap();
     }
 
     #else
diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro
index ecd73cc9cc6..bce0d216546 100644
--- a/tests/manual/debugger/simple/simple_test_app.pro
+++ b/tests/manual/debugger/simple/simple_test_app.pro
@@ -27,6 +27,9 @@ maemo5 {
     INSTALLS += target
 }
 
+exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += USE_PRIVATE
+exists(/usr/include/boost/optional.hpp): DEFINES += USE_BOOST
+exists(/usr/include/eigen2/Eigen/Core): DEFINES += USE_EIGEN
 
 # Use for semi-automated testing
 #DEFINES += USE_AUTORUN=1