diff --git a/platform/qt/app/qmapboxgl.gypi b/platform/qt/app/qmapboxgl.gypi
index b2cc3c4b1..62a2939ad 100644
--- a/platform/qt/app/qmapboxgl.gypi
+++ b/platform/qt/app/qmapboxgl.gypi
@@ -26,12 +26,16 @@
       'variables': {
         'cflags': [
           '<@(opengl_cflags)',
-          '<@(qt_cflags)',
+          '<@(qt_core_cflags)',
+          '<@(qt_gui_cflags)',
+          '<@(qt_opengl_cflags)',
           '-fPIC',
         ],
         'ldflags': [
           '<@(opengl_ldflags)',
-          '<@(qt_ldflags)'
+          '<@(qt_core_ldflags)',
+          '<@(qt_gui_ldflags)',
+          '<@(qt_opengl_ldflags)',
         ],
       },
 
diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp
index 3e22d1842..fb833e985 100644
--- a/platform/qt/platform.gyp
+++ b/platform/qt/platform.gyp
@@ -69,7 +69,9 @@
           '<@(libjpeg-turbo_cflags)',
           '<@(nunicode_cflags)',
           '<@(opengl_cflags)',
-          '<@(qt_cflags)',
+          '<@(qt_core_cflags)',
+          '<@(qt_gui_cflags)',
+          '<@(qt_network_cflags)',
           '<@(rapidjson_cflags)',
           '<@(sqlite_cflags)',
           '<@(variant_cflags)',
@@ -80,7 +82,9 @@
           '<@(libjpeg-turbo_ldflags)',
           '<@(nunicode_ldflags)',
           '<@(opengl_ldflags)',
-          '<@(qt_ldflags)',
+          '<@(qt_core_ldflags)',
+          '<@(qt_gui_ldflags)',
+          '<@(qt_network_ldflags)',
           '<@(sqlite_ldflags)',
           '<@(webp_ldflags)',
           '<@(zlib_ldflags)',
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh
index ec88247c9..321a0ffa6 100644
--- a/platform/qt/scripts/configure.sh
+++ b/platform/qt/scripts/configure.sh
@@ -31,8 +31,15 @@ fi
 function print_qt_flags {
     mason install Qt system
 
-    CONFIG+="    'qt_cflags%': $(quote_flags $(mason cflags Qt system "QtCore QtGui QtOpenGL QtNetwork")),"$LN
-    CONFIG+="    'qt_ldflags%': $(quote_flags $(mason ldflags Qt system "QtCore QtGui QtOpenGL QtNetwork")),"$LN
+    CONFIG+="    'qt_core_cflags%': $(quote_flags $(mason cflags Qt system "QtCore")),"$LN
+    CONFIG+="    'qt_gui_cflags%': $(quote_flags $(mason cflags Qt system "QtGui")),"$LN
+    CONFIG+="    'qt_opengl_cflags%': $(quote_flags $(mason cflags Qt system "QtOpenGL")),"$LN
+    CONFIG+="    'qt_network_cflags%': $(quote_flags $(mason cflags Qt system "QtNetwork")),"$LN
+
+    CONFIG+="    'qt_core_ldflags%': $(quote_flags $(mason ldflags Qt system "QtCore")),"$LN
+    CONFIG+="    'qt_gui_ldflags%': $(quote_flags $(mason ldflags Qt system "QtGui")),"$LN
+    CONFIG+="    'qt_opengl_ldflags%': $(quote_flags $(mason ldflags Qt system "QtOpenGL")),"$LN
+    CONFIG+="    'qt_network_ldflags%': $(quote_flags $(mason ldflags Qt system "QtNetwork")),"$LN
 
     QT_VERSION_MAJOR=$(qmake -query QT_VERSION | cut -d. -f1)
     if hash moc 2>/dev/null && hash rcc 2>/dev/null; then