Move private headers into versioned subdirectory

This will allow us to expose private headers in a controlled manner,
and ensure that they are not used by accident. This also means that
we internally will have to enable the private headers for the
modules we wish to use in the project.

bin/syncqt

@@ -747,6 +747,21 @@ mkpath "$out_basedir/include/Qt", !$quiet;
 foreach my $lib (@modules_to_sync) {
     #iteration info
     my $dir = $modules{$lib};
+    my $module_version = "";
+
+    if (-e "$modulepris{$lib}") {
+        my $content = fileContents($modulepris{$lib});
+        my @version_rows = grep(/QT\..*\.VERSION/, split('\n', $content));
+        if(@version_rows) {
+            # We only pick the first one, since each module need a separate .pri file
+            $module_version = $version_rows[0];
+            chomp $module_version;
+            $module_version =~ s/^\s*QT\..*\.VERSION\s*=\s*([^#]+).*$/$1/;
+            $module_version =~ s/\s+$//;
+        }
+    }
+    print "WARNING: Module $lib\'s pri missing QT.<module>.VERSION variable! Private headers not versioned!\n" if (!$module_version);
+
     my $pathtoheaders = "";
     $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib});
 
@@ -766,6 +781,7 @@ foreach my $lib (@modules_to_sync) {
                 chomp $line;
                 if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {
                     foreach(split(/ /, $1)) {
+                        $_ =~ s/-private$//;
                         my $content = $mastercontent{$_};
                         $master_contents .= $content if ($content);
                     }
@@ -913,8 +929,12 @@ foreach my $lib (@modules_to_sync) {
                                 }
                             }
                         } elsif ($create_private_headers) {
+                            if ($module_version) {
+                                @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" );
+                            } else {
                                 @headers = ( "$out_basedir/include/$lib/private/$header" );
                             }
+                        }
                         foreach(@headers) { #sync them
                             $header_copies++ if(syncHeader($_, $iheader, $copy_headers && !$shadow, $ts));
                         }

configure

@@ -4921,7 +4921,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
             -e "s,@QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
             -e "s,@QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
             -e "s,@QMAKE_QTOBJS@,$EXTRA_OBJS,g" -e "s,@QMAKE_QTSRCS@,$EXTRA_SRCS,g" \
-	    -e "s,@QMAKESPEC@,$adjqmakespec,g" "$in_mkfile" >>"$mkfile"
+            -e "s,@QMAKESPEC@,$adjqmakespec,g" -e "s,@QT_VERSION@,$QT_VERSION,g" "$in_mkfile" >>"$mkfile"
 
         if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
             (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
@@ -8500,7 +8500,7 @@ CACHEFILE="$outpath/.qmake.cache"
 [ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
 cat >>"$CACHEFILE.tmp" <<EOF
 include(\$\$PWD/mkspecs/qmodule.pri)
-CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build
+CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build
 QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
 QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
 

demos/shared/shared.pro

@@ -11,6 +11,7 @@ build_all:!build_pass {
     CONFIG += release
 }
 TARGET = demo_shared
+QT += gui-private
 
 SOURCES += \
 	arthurstyle.cpp\

mkspecs/features/designer.prf

@@ -4,4 +4,4 @@ qt:load(qt)
 
 plugin:DEFINES += QDESIGNER_EXPORT_WIDGETS
 
-qtAddLibrary(QtDesigner)
+qtAddLibrary(QtDesigner, true)

mkspecs/features/help.prf

@@ -1,3 +1,3 @@
 QT += xml sql
 
-qtAddModule(help)
+qtAddModule(help, true)

mkspecs/features/qt.prf

@@ -131,7 +131,16 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
 QT = $$resolve_depends($$QT, "QT.")
 QT_DEPENDS=
 
+unset(using_privates)
 for(QTLIB, $$list($$lower($$unique(QT)))) {
+    # Figure out if we're wanting to use the private headers of a module
+    contains(QTLIB, .*-private) {
+        QTLIB ~= s/-private//
+        use_private = UsePrivate
+    } else {
+        use_private = NoPrivate
+    }
+
     isEmpty(QT.$${QTLIB}.name) {
         message("Warning: unknown QT module: $$QTLIB")
         next()
@@ -141,14 +150,21 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
         warning($$TARGET cannot have a QT of $$QTLIB)
         next()
     }
-    qtAddModule($$QTLIB)
+    qtAddModule($$QTLIB, $$use_private)
     QT_DEPENDS += $$eval(QT.$${QTLIB}.depends)
+    isEqual(use_private, UsePrivate):using_privates = true
 }
 
 # add include paths for all .depends, since module/application might need f.ex. template specializations etc.
 QT_DEPENDS -= $$QT
 for(QTLIB, $$list($$lower($$unique(QT_DEPENDS)))):INCLUDEPATH += $$INCLUDEPATH $$eval(QT.$${QTLIB}.includes)
 
+!isEmpty(using_privates):!no_private_qt_headers_warning:if(!debug_and_release|!build_pass) {
+    message("This project is using private headers and will therefore be tied to this specific Qt module build version.")
+    message("Running this project against other versions of the Qt modules may crash at any arbitrary point.")
+    message("This is not a bug, but a result of using Qt internals. You have been warned!")
+}
+
 qt_compat {
    !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
    INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt

mkspecs/features/qt_functions.prf

@@ -102,6 +102,16 @@ defineTest(qtAddModule) {
 
     INCLUDEPATH -= $$MODULE_INCLUDES
     INCLUDEPATH = $$MODULE_INCLUDES $$INCLUDEPATH
+    isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate'
+        # This adds both
+        #     <module privates include path>/
+        # and <module privates include path>/<module name>
+        # since we have code using both #include <QtCore/private/foo> and #include <private/foo>
+        # Both need to be supported with the new private includes structure
+        MODULE_INCLUDES_PRIVATES = $$eval(QT.$${1}.private_includes)
+        INCLUDEPATH -= $$MODULE_INCLUDES_PRIVATES $$MODULE_INCLUDES_PRIVATES/$$MODULE_NAME
+        INCLUDEPATH = $$MODULE_INCLUDES_PRIVATES $$MODULE_INCLUDES_PRIVATES/$$MODULE_NAME $$INCLUDEPATH
+    }
 
     unset(LINKAGE)
     mac {
@@ -140,12 +150,16 @@ defineTest(qtAddModule) {
        }
        isEmpty(LINKAGE):LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}
     }
+    # Only link to this module if a libs directory is set, else this is just a module
+    # to give access to sources or include files, and not for linking.
+    !isEmpty(MODULE_LIBS) {
         !isEmpty(QMAKE_LSB) {
             QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
             QMAKE_LFLAGS *= -L/opt/lsb/lib
             QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX}
         }
         LIBS += $$LINKAGE
+    }
     export(CONFIG)
     export(DEFINES)
     export(LIBS)

qmake/Makefile.unix

@@ -1,5 +1,6 @@
 SOURCE_PATH = @SOURCE_PATH@
 BUILD_PATH = @BUILD_PATH@
+QT_VERSION = @QT_VERSION@
 QTOBJS = @QMAKE_QTOBJS@
 QTSRCS = @QMAKE_QTSRCS@
 QMAKESPEC = @QMAKESPEC@
@@ -76,6 +77,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \
            -Igenerators/mac -Igenerators/symbian -Igenerators/integrity \
 	   -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
+	   -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
 	   -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
 	   -I$(SOURCE_PATH)/tools/shared \
 	   -DQT_NO_PCRE \

qmake/Makefile.win32

@@ -32,8 +32,8 @@ CFLAGS_BARE = -c -Fo./ \
               -W3 -nologo -O2 \
               $(CFLAGS_EXTRA) \
               -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian -Igenerators\integrity \
-              -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
+              -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore -I$(BUILD_PATH)\include\QtCore\$(QT_VERSION) -I$(BUILD_PATH)\include\QtCore\$(QT_VERSION)\QtCore \
-              -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
+              -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore -I$(SOURCE_PATH)\include\QtCore\$(QT_VERSION) -I$(SOURCE_PATH)\include\QtCore\$(QT_VERSION)\QtCore \
               -I$(BUILD_PATH)\src\corelib\global \
               -I$(BUILD_PATH)\src\corelib\xml \
               -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \

qmake/Makefile.win32-g++

@@ -16,8 +16,8 @@ CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators/unix \
 		-Igenerators/win32 -Igenerators/mac \
 		-Igenerators/symbian -Igenerators/integrity \
-		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
+		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
-		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
+		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(SOURCE_PATH)/include/QtCore/$(QT_VERSION) -I$(SOURCE_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
 		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \

qmake/Makefile.win32-g++-sh

@@ -16,8 +16,8 @@ CFLAGS	    =	-c -o$@ -O \
 		-I. -Igenerators -Igenerators/unix \
 		-Igenerators/win32 -Igenerators/mac \
 		-Igenerators/symbian -Igenerators/integrity \
-		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
+		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
-		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
+		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(SOURCE_PATH)/include/QtCore/$(QT_VERSION) -I$(SOURCE_PATH)/include/QtCore/$(QT_VERSION)/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
 		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \

qmake/qmake.pro

@@ -27,6 +27,8 @@ INCLUDEPATH += . \
            generators/symbian \
            $$QT_SOURCE_TREE/include \
            $$QT_SOURCE_TREE/include/QtCore \
+           $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION \
+           $$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION/QtCore \
            $$QT_SOURCE_TREE/qmake
 
 VPATH += $$QT_SOURCE_TREE/tools/shared

src/dbus/dbus.pro

@@ -1,6 +1,6 @@
 TARGET = QtDBus
 QPRO_PWD = $$PWD
-QT = core \
+QT = core-private \
     xml
 
 CONFIG += link_pkgconfig module

src/gui/gui.pro

@@ -1,6 +1,6 @@
 TARGET     = QtGui
 QPRO_PWD   = $$PWD
-QT = core
+QT = core-private
 
 CONFIG += module
 MODULE_PRI = ../modules/qt_gui.pri

src/modules/qt_core.pri

@@ -1,12 +1,12 @@
-QT_CORE_VERSION = $$QT_VERSION
+QT.core.VERSION = 4.8.0
-QT_CORE_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.core.MAJOR_VERSION = 4
-QT_CORE_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.core.MINOR_VERSION = 8
-QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.core.PATCH_VERSION = 0
 
 QT.core.name = QtCore
 QT.core.bins = $$QT_MODULE_BIN_BASE
 QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore
-QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private
+QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/$$QT.core.VERSION
 QT.core.sources = $$QT_MODULE_BASE/src/corelib
 QT.core.libs = $$QT_MODULE_LIB_BASE
 QT.core.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_dbus.pri

@@ -1,12 +1,12 @@
-QT_DBUS_VERSION = $$QT_VERSION
+QT.dbus.VERSION = 4.8.0
-QT_DBUS_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.dbus.MAJOR_VERSION = 4
-QT_DBUS_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.dbus.MINOR_VERSION = 8
-QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.dbus.PATCH_VERSION = 0
 
 QT.dbus.name = QtDBus
 QT.dbus.bins = $$QT_MODULE_BIN_BASE
 QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus
-QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private
+QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/$$QT.dbus.VERSION
 QT.dbus.sources = $$QT_MODULE_BASE/src/dbus
 QT.dbus.libs = $$QT_MODULE_LIB_BASE
 QT.dbus.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_gui.pri

@@ -1,11 +1,11 @@
-QT_GUI_VERSION = $$QT_VERSION
+QT.gui.VERSION = 4.8.0
-QT_GUI_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.gui.MAJOR_VERSION = 4
-QT_GUI_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.gui.MINOR_VERSION = 8
-QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.gui.PATCH_VERSION = 0
 
 QT.gui.name = QtGui
 QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui
-QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private
+QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/$$QT.gui.VERSION
 QT.gui.sources = $$QT_MODULE_BASE/src/gui
 QT.gui.libs = $$QT_MODULE_LIB_BASE
 QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_network.pri

@@ -1,12 +1,12 @@
-QT_CORE_VERSION = $$QT_VERSION
+QT.network.VERSION = 4.8.0
-QT_NETWORK_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.network.MAJOR_VERSION = 4
-QT_NETWORK_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.network.MINOR_VERSION = 8
-QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.network.PATCH_VERSION = 0
 
 QT.network.name = QtNetwork
 QT.network.bins = $$QT_MODULE_BIN_BASE
 QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork
-QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private
+QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/$$QT.network.VERSION
 QT.network.sources = $$QT_MODULE_BASE/src/network
 QT.network.libs = $$QT_MODULE_LIB_BASE
 QT.network.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_opengl.pri

@@ -1,12 +1,12 @@
-QT_OPENGL_VERSION = $$QT_VERSION
+QT.opengl.VERSION = 4.8.0
-QT_OPENGL_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.opengl.MAJOR_VERSION = 4
-QT_OPENGL_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.opengl.MINOR_VERSION = 8
-QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.opengl.PATCH_VERSION = 0
 
 QT.opengl.name = QtOpenGL
 QT.opengl.bins = $$QT_MODULE_BIN_BASE
 QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL
-QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private
+QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/$$QT.opengl.VERSION
 QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
 QT.opengl.libs = $$QT_MODULE_LIB_BASE
 QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_openvg.pri

@@ -1,12 +1,12 @@
-QT_OPENVG_VERSION = $$QT_VERSION
+QT.openvg.VERSION = 4.8.0
-QT_OPENVG_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.openvg.MAJOR_VERSION = 4
-QT_OPENVG_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.openvg.MINOR_VERSION = 8
-QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.openvg.PATCH_VERSION = 0
 
 QT.openvg.name = QtOpenVG
 QT.openvg.bins = $$QT_MODULE_BIN_BASE
 QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG
-QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private
+QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/$$QT.openvg.VERSION
 QT.openvg.sources = $$QT_MODULE_BASE/src/openvg
 QT.openvg.libs = $$QT_MODULE_LIB_BASE
 QT.openvg.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_sql.pri

@@ -1,12 +1,12 @@
-QT_SQL_VERSION = $$QT_VERSION
+QT.sql.VERSION = 4.8.0
-QT_SQL_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.sql.MAJOR_VERSION = 4
-QT_SQL_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.sql.MINOR_VERSION = 8
-QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.sql.PATCH_VERSION = 0
 
 QT.sql.name = QtSql
 QT.sql.bins = $$QT_MODULE_BIN_BASE
 QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql
-QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private
+QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/$$QT.sql.VERSION
 QT.sql.sources = $$QT_MODULE_BASE/src/sql
 QT.sql.libs = $$QT_MODULE_LIB_BASE
 QT.sql.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_testlib.pri

@@ -1,12 +1,12 @@
-QT_TEST_VERSION = $$QT_VERSION
+QT.testlib.VERSION = 4.8.0
-QT_TEST_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.testlib.MAJOR_VERSION = 4
-QT_TEST_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.testlib.MINOR_VERSION = 8
-QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.testlib.PATCH_VERSION = 0
 
 QT.testlib.name = QtTest
 QT.testlib.bins = $$QT_MODULE_BIN_BASE
 QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest
-QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private
+QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/$$QT.testlib.VERSION
 QT.testlib.sources = $$QT_MODULE_BASE/src/testlib
 QT.testlib.libs = $$QT_MODULE_LIB_BASE
 QT.testlib.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_uilib.pri

@@ -1,14 +1,13 @@
-QT_UILIB_VERSION = $$QT_VERSION
+QT.uilib.VERSION = 4.8.0
-QT_UILIB_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.uilib.MAJOR_VERSION = 4
-QT_UILIB_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.uilib.MINOR_VERSION = 8
-QT_UILIB_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.uilib.PATCH_VERSION = 0
 
-QT.uilib.name =
+QT.uilib.name = QtUiLib
 QT.uilib.bins = $$QT_MODULE_BIN_BASE
 QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner
-QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
+QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/$$QT.uilib.VERSION
 QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib
-QT.uilib.libs = $$QT_MODULE_LIB_BASE
 QT.uilib.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.uilib.imports = $$QT_MODULE_IMPORT_BASE
 QT.uilib.depends = xml

src/modules/qt_uitools.pri

@@ -1,12 +1,12 @@
-QT_UITOOLS_VERSION = $$QT_VERSION
+QT.uitools.VERSION = 4.8.0
-QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.uitools.MAJOR_VERSION = 4
-QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.uitools.MINOR_VERSION = 8
-QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.uitools.PATCH_VERSION = 0
 
 QT.uitools.name = QtUiTools
 QT.uitools.bins = $$QT_MODULE_BIN_BASE
 QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools
-QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
+QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/$$QT.uitools.VERSION
 QT.uitools.sources = $$QT_MODULE_BASE/src/uitools
 QT.uitools.libs = $$QT_MODULE_LIB_BASE
 QT.uitools.plugins = $$QT_MODULE_PLUGIN_BASE

src/modules/qt_xml.pri

@@ -1,12 +1,12 @@
-QT_XML_VERSION = $$QT_VERSION
+QT.xml.VERSION = 4.8.0
-QT_XML_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT.xml.MAJOR_VERSION = 4
-QT_XML_MINOR_VERSION = $$QT_MINOR_VERSION
+QT.xml.MINOR_VERSION = 8
-QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.xml.PATCH_VERSION = 0
 
 QT.xml.name = QtXml
 QT.xml.bins = $$QT_MODULE_BIN_BASE
 QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml
-QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private
+QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/$$QT.xml.VERSION
 QT.xml.sources = $$QT_MODULE_BASE/src/xml
 QT.xml.libs = $$QT_MODULE_LIB_BASE
 QT.xml.plugins = $$QT_MODULE_PLUGIN_BASE

src/network/network.pro

@@ -13,7 +13,7 @@ DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
 #DEFINES += QABSTRACTSOCKET_DEBUG QNATIVESOCKETENGINE_DEBUG
 #DEFINES += QTCPSOCKETENGINE_DEBUG QTCPSOCKET_DEBUG QTCPSERVER_DEBUG QSSLSOCKET_DEBUG
 #DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG
-QT = core
+QT = core-private
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
 
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore

src/opengl/opengl.pro

@@ -1,6 +1,6 @@
 TARGET     = QtOpenGL
 QPRO_PWD   = $$PWD
-QT         = core gui
+QT         = core-private gui-private
 
 CONFIG += module
 MODULE_PRI = ../modules/qt_opengl.pri

src/plugins/accessible/widgets/widgets.pro

@@ -2,6 +2,7 @@ TARGET  = qtaccessiblewidgets
 include(../../qpluginbase.pri)
 include (../qaccessiblebase.pri)
 
+QT += core-private gui-private
 DESTDIR = $$QT.gui.plugins/accessible
 
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"

src/plugins/bearer/connman/connman.pro

@@ -1,7 +1,7 @@
 TARGET = qconnmanbearer
 include(../../qpluginbase.pri)
 
-QT = core network dbus
+QT = core network-private dbus
 
 HEADERS += qconnmanservice_linux_p.h \
            qofonoservice_linux_p.h \

src/plugins/bearer/generic/generic.pro

@@ -1,7 +1,7 @@
 TARGET = qgenericbearer
 include(../../qpluginbase.pri)
 
-QT = core network
+QT = core-private network-private
 
 HEADERS += qgenericengine.h \
            ../qnetworksession_impl.h \

src/plugins/bearer/nativewifi/nativewifi.pro

@@ -1,7 +1,7 @@
 TARGET = qnativewifibearer
 include(../../qpluginbase.pri)
 
-QT = core network
+QT = core-private network-private
 
 HEADERS += qnativewifiengine.h \
            platformdefs.h \

src/plugins/bearer/networkmanager/networkmanager.pro

@@ -1,7 +1,7 @@
 TARGET = qnmbearer
 include(../../qpluginbase.pri)
 
-QT = core network dbus
+QT = core network-private dbus
 
 HEADERS += qnmdbushelper.h \
            qnetworkmanagerservice.h \

src/plugins/graphicssystems/opengl/opengl.pro

@@ -1,7 +1,7 @@
 TARGET = qglgraphicssystem
 include(../../qpluginbase.pri)
 
-QT += opengl
+QT += core-private gui-private opengl-private
 
 DESTDIR = $$QT.gui.plugins/graphicssystems
 

src/plugins/graphicssystems/trace/trace.pro

@@ -1,7 +1,7 @@
 TARGET = qtracegraphicssystem
 include(../../qpluginbase.pri)
 
-QT += network
+QT += core-private gui-private network
 
 DESTDIR = $$QT.gui.plugins/graphicssystems
 symbian:TARGET.UID3 = 0x2002130E

src/plugins/imageformats/jpeg/jpeg.pro

@@ -1,6 +1,8 @@
 TARGET  = qjpeg
 include(../../qpluginbase.pri)
 
+QT += core-private
+
 QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"
 
 include(../../../gui/image/qjpeghandler.pri)

src/plugins/sqldrivers/qsqldriverbase.pri

@@ -1,5 +1,5 @@
 include(../qpluginbase.pri)
-QT  = core sql
+QT  = core sql-private
 DESTDIR = $$QT.sql.plugins/sqldrivers
 
 target.path     += $$[QT_INSTALL_PLUGINS]/sqldrivers

src/qbase.pri

@@ -4,6 +4,9 @@ isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0)
 isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}")
 
 MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes)
+MODULE_PRIVATE_INCLUDES = $$eval(QT.$${MODULE}.private_includes)
+INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES
+INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET
 INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat
 !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700

src/qt_install.pri

@@ -31,12 +31,10 @@ qt_install_headers {
     targ_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
     INSTALLS += targ_headers
 
-    contains(QT_CONFIG,private_tests) {
     private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES
-        private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/private
+    private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$$eval(QT.$${MODULE}.VERSION)/private
     INSTALLS += private_headers
 }
-}
 
 embedded|qpa: equals(TARGET, QtGui) {
     # install fonts for embedded

src/sql/sql.pro

@@ -1,6 +1,6 @@
 TARGET	   = QtSql
 QPRO_PWD   = $$PWD
-QT         = core
+QT         = core-private
 
 CONFIG += module
 MODULE_PRI = ../modules/qt_sql.pri

src/tools/bootstrap/bootstrap.pri

@@ -29,7 +29,11 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH	+= $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtCore \
+                   $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
+                   $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \
                    $$QT_BUILD_TREE/include/QtXml \
+                   $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \
+                   $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml \
                    $$QT_SOURCE_TREE/src/xml
 DEPENDPATH	+= $$INCLUDEPATH \
                    $$QT_SOURCE_TREE/src/corelib/global \

src/tools/bootstrap/bootstrap.pro

@@ -32,7 +32,11 @@ win32:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
             $$QT_BUILD_TREE/include/QtCore \
-            $$QT_BUILD_TREE/include/QtXml
+            $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
+            $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \
+            $$QT_BUILD_TREE/include/QtXml \
+            $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION \
+            $$QT_BUILD_TREE/include/QtXml/$$QT.xml.VERSION/QtXml \
 
 DEPENDPATH += $$INCLUDEPATH \
               ../../corelib/global \

src/xml/xml.pro

@@ -1,6 +1,6 @@
 TARGET     = QtXml
 QPRO_PWD   = $$PWD
-QT         = core
+QT         = core-private
 
 CONFIG += module
 MODULE_PRI = ../modules/qt_xml.pri

tools/configure/configure.pro

@@ -28,6 +28,8 @@ INCLUDEPATH += \
            $$QT_SOURCE_TREE/src/corelib/global \
            $$QT_BUILD_TREE/include \
            $$QT_BUILD_TREE/include/QtCore \
+           $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION \
+           $$QT_BUILD_TREE/include/QtCore/$$QT.core.VERSION/QtCore \
            $$QT_SOURCE_TREE/tools/shared
 
 HEADERS  = configureapp.h environment.h tools.h\

tools/configure/configureapp.cpp

@@ -2913,7 +2913,7 @@ void Configure::generateCachefile()
         for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
             cacheStream << (*var) << endl;
         }
-        cacheStream << "CONFIG         += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl;
+        cacheStream << "CONFIG         += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath no_private_qt_headers_warning QTDIR_build" << endl;
 
         cacheStream.flush();
         cacheFile.close();
@@ -3648,7 +3648,8 @@ void Configure::buildQmake()
                 stream << "#AutoGenerated by configure.exe" << endl
                     << "BUILD_PATH = " << QDir::convertSeparators(buildPath) << endl
                     << "SOURCE_PATH = " << QDir::convertSeparators(sourcePath) << endl;
-                stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl;
+                stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl
+                       << "QT_VERSION = " << QT_VERSION_STR << endl;
 
                 if (dictionary["EDITION"] == "OpenSource" ||
                     dictionary["QT_EDITION"].contains("OPENSOURCE"))