Merge remote-tracking branch 'qt/4.8'

3 files changed, 29 insertions, 9 deletions

diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf
index a3dbd1f..91683f6 100644
--- a/mkspecs/features/link_pkgconfig.prf
+++ b/mkspecs/features/link_pkgconfig.prf
@@ -5,8 +5,21 @@ for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {
     # don't proceed if the .pro asks for a package we don't have!
     !packagesExist($$PKGCONFIG_LIB):error("Package $$PKGCONFIG_LIB not found")
 
-    QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
-    QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
+    PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)
+
+    PKGCONFIG_INCLUDEPATH = $$find(PKGCONFIG_CFLAGS, ^-I.*)
+    PKGCONFIG_INCLUDEPATH ~= s/^-I(.*)/\\1/g
+
+    PKGCONFIG_DEFINES = $$find(PKGCONFIG_CFLAGS, ^-D.*)
+    PKGCONFIG_DEFINES ~= s/^-D(.*)/\\1/g
+
+    PKGCONFIG_CFLAGS ~= s/^-[ID].*//g
+
+    INCLUDEPATH *= $$PKGCONFIG_INCLUDEPATH
+    DEFINES *= $$PKGCONFIG_DEFINES
+
+    QMAKE_CXXFLAGS += $$PKGCONFIG_CFLAGS
+    QMAKE_CFLAGS += $$PKGCONFIG_CFLAGS
     LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB)
 }
 
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 191a449..326fe10 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -64,29 +64,35 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
        # Check if the plugin is known to Qt. We can use this to determine
        # the plugin path. Unknown plugins must rely on the default link path.
        ACCESSIBLEPLUGINS = qtaccessiblewidgets qtaccessiblecompatwidgets
+       BEARERPLUGINS = qgenericbearer qnativewifibearer
        CODECPLUGINS = qcncodecs qjpcodecs qkrcodecs qtwcodecs
-       DECORATIONPLUGINS = qdecorationdefault qdecorationwindows
-       GFXDRIVERPLUGINS = qgfxvnc qscreenvfb qgfxsnap qgfxvga16 qgfxmatrox qgfxvoodoo qgfxtransformed qgfxshadowfb
-       IMAGEPLUGINS = qgif qmng qjpeg qsvg
+       DECORATIONPLUGINS = qdecorationdefault qdecorationstyled qdecorationwindows
+       GFXDRIVERPLUGINS = qgfxvnc qscreenvfb qgfxtransformed qgfxshadowfb qgfxpvregl qscreenlinuxfb qeglnullws qdirectfbscreen qahiscreen
+       GRAPHICSSYSTEMPLUGINS = qmeegographicssystem qglgraphicssystem qvggraphicssystem qshivavggraphicssystem
+       IMAGEPLUGINS = qgif qico qmng qjpeg qsvg qtiff
        INPUTPLUGINS = qimsw-multi
-       MOUSEDRIVERPLUGINS = qtslibmousehandler
+       KBDDRIVERPLUGINS = qlinuxinputkbddriver
+       MOUSEDRIVERPLUGINS = qtslibmousehandler qpcmousedriver qlinuxtpmousedriver
        SQLPLUGINS = qsqldb2 qsqloci qsqltds qsqlodbc qsqlpsql qsqlibase qsqlmysql qsqlite2 qsqlite
-       PHONONPLUGINS = phonon_waveout phonon_ds9
+       PHONONPLUGINS = phonon_waveout phonon_ds9 phonon_gstreamer phonon_qt7 phonon_mmf
 
-       ALLQTPLUGINS = $$ACCESSIBLEPLUGINS $$CODECPLUGINS $$DECORATIONPLUGINS $$GFXDRIVERPLUGINS $$IMAGEPLUGINS $$INPUTPLUGINS $$MOUSEDRIVERPLUGINS $$SQLPLUGINS $$PHONONPLUGINS
+       ALLQTPLUGINS = $$ACCESSIBLEPLUGINS $$BEARERPLUGINS $$CODECPLUGINS $$DECORATIONPLUGINS $$GFXDRIVERPLUGINS $$ GRAPHICSSYSTEMPLUGINS $$IMAGEPLUGINS $$INPUTPLUGINS $$KBDDRIVERPLUGINS $$MOUSEDRIVERPLUGINS $$SQLPLUGINS $$PHONONPLUGINS
 
        QT_PLUGINPATH =
        contains(ALLQTPLUGINS, $$QTPLUG) {
            # Determine the plugin path
            contains(ACCESSIBLEPLUGINS, $$QTPLUG): QT_PLUGINPATH = accessible
+           contains(BEARERPLUGINS, $$QTPLUG): QT_PLUGINPATH = bearer
            contains(CODECPLUGINS, $$QTPLUG): QT_PLUGINPATH = codecs
            contains(DECORATIONPLUGINS, $$QTPLUG): QT_PLUGINPATH = decorations
            contains(GFXDRIVERPLUGINS, $$QTPLUG): QT_PLUGINPATH = gfxdrivers
+           contains(GRAPHICSSYSTEMPLUGINS, $$QTPLUG): QT_PLUGINPATH = graphicssystems
            contains(IMAGEPLUGINS, $$QTPLUG): QT_PLUGINPATH = imageformats
            contains(INPUTPLUGINS, $$QTPLUG): QT_PLUGINPATH = inputmethods
+           contains(KBDDRIVERPLUGINS, $$QTPLUG): QT_PLUGINPATH = kbddrivers
            contains(MOUSEDRIVERPLUGINS, $$QTPLUG): QT_PLUGINPATH = mousedrivers
            contains(SQLPLUGINS, $$QTPLUG):  QT_PLUGINPATH = sqldrivers
-	   contains(PHONONPLUGINS, $$QTPLUG): QT_PLUGINPATH = phonon_backend
+           contains(PHONONPLUGINS, $$QTPLUG): QT_PLUGINPATH = phonon_backend
         }
 
         # Generate the plugin linker line
diff --git a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
index 919d2cf..589b3bf 100644
--- a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
+++ b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
@@ -89,6 +89,7 @@
 #define QT_TRUNCATE             ::truncate
 #define QT_FTRUNCATE            ::ftruncate
 #define QT_LSEEK                ::lseek
+#define QT_OPEN_LARGEFILE       0
 #endif
 
 #ifdef QT_LARGEFILE_SUPPORT