diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 61a6587..6dddce3 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -825,7 +825,7 @@ void QWingedEdge::intersectAndAdd()
             }
         }
 
-        std::sort(intersections.data(), intersections.data() + intersections.size());
+        qSort(intersections.data(), intersections.data() + intersections.size());
 
         int first = m_segments.segmentAt(i).va;
         int second = m_segments.segmentAt(i).vb;
@@ -1652,7 +1652,7 @@ bool QPathClipper::doClip(QWingedEdge &list, ClipperMode mode)
     for (int i = 0; i < list.vertexCount(); ++i)
         y_coords << list.vertex(i)->y;
 
-    std::sort(y_coords.begin(), y_coords.end());
+    qSort(y_coords.begin(), y_coords.end());
     y_coords.resize(qRemoveDuplicates(y_coords.begin(), y_coords.end(), fuzzyCompare) - y_coords.begin());
 
 #ifdef QDEBUG_CLIPPER
@@ -1828,7 +1828,7 @@ bool QPathClipper::handleCrossingEdges(QWingedEdge &list, qreal y, ClipperMode m
     QVector<QCrossingEdge> crossings = findCrossings(list, y);
 
     Q_ASSERT(!crossings.isEmpty());
-    std::sort(crossings.begin(), crossings.end());
+    qSort(crossings.begin(), crossings.end());
 
     int windingA = 0;
     int windingB = 0;
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index 43f7ae8..d61cd0c 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -12,6 +12,8 @@ MODULE_PLUGIN_TYPES = \
 
 QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf
 
+QMAKE_CFLAGS+="-gdwarf-2"
+
 load(qt_module)
 
 #platforms