diff --git a/include/stl_check.h b/include/stl_check.h
index 5f5bf042..b08142bd 100644
--- a/include/stl_check.h
+++ b/include/stl_check.h
@@ -24,7 +24,10 @@
    this allows to catch some weird errors early at compile time
  */
 
+// TODO: finish complete cleanup and removal of STLPort usage traces
+#ifndef Q_NO_STLPORT
 #define Q_NO_STLPORT
+#endif
 
 #ifdef Q_NO_STLPORT