plugins/bearer/connman does not build with Sun Studio

building Qt from today's git fails with the below error:
...
$ CC -c -O2 -xldscope=hidden -mt -KPIC -DQT_NO_DEBUG -DQT_PLUGIN -DQT_DBUS_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -I../../../../mkspecs/solaris-cc -I. -I../../../../include/QtCore -I../../../../include/QtNetwork -I../../../../include/QtDBus -I../../../../include -I.moc/release-shared -I/usr/sfw/include -o .obj/release-shared/qconnmanservice_linux.o qconnmanservice_linux.cpp
"qconnmanservice_linux.cpp", line 485: Error: _FUNCTION_ is not defined.
"qconnmanservice_linux.cpp", line 1056: Error: _FUNCTION_ is not defined.

I had to add -features=extensions to make it work. As I noted the gcc extension _FUNCTION_ is used in various places as well, I think the best is to use it globally:

diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index a026756..c5ab08b 100644
— a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -45,7 +45,7 @@ QMAKE_CFLAGS_THREAD = -mt
QMAKE_CFLAGS_HIDESYMS = -xldscope=hidden

QMAKE_CXX = CC
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -features=extensions
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 8a8f1ac..196e990 100644
— a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -28,7 +28,7 @@ QMAKE_CFLAGS_THREAD = -mt
QMAKE_CFLAGS_HIDESYMS = -xldscope=hidden

QMAKE_CXX = CC
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -features=extensions
QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF