Revert "Fix detection of linux-g++"
authorPaul Olav Tvete <paul.tvete@nokia.com>
Thu, 19 Nov 2009 10:26:44 +0000 (11:26 +0100)
committerJason McDonald <jason.mcdonald@nokia.com>
Thu, 19 Nov 2009 11:13:02 +0000 (21:13 +1000)
commit27c55c8a274e0a6ab5cce5903be00688fe877ebe
treeb7cf89b1601b0afb114cc7dcec73e815f5d4c7bd
parent73111ea26640789a3efa315ab7d44841048df177
Revert "Fix detection of linux-g++"

This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2.
The change broke compilation of QWS, since QtGui depends on glib,
but doesn't link with it directly. This needs to be fixed properly,
but not just before the release.

Reviewed-by: Harald Fernengel
(cherry picked from commit baab5f7e77c1216ede839766c97abef1a708b365)
src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
src/corelib/global/global.pri
src/qbase.pri