Index: trunk/include/ActiveQt/ActiveQt
===================================================================
--- trunk/include/ActiveQt/ActiveQt	(revision 769)
+++ trunk/include/ActiveQt/ActiveQt	(revision 846)
@@ -6,7 +6,7 @@
 #include "qaxselect.h"
 #include "qaxwidget.h"
+#include "qaxtypes.h"
 #include "qaxaggregated.h"
 #include "qaxbindable.h"
 #include "qaxfactory.h"
-#include "qaxtypes.h"
 #endif
Index: trunk/include/ActiveQt/headers.pri
===================================================================
--- trunk/include/ActiveQt/headers.pri	(revision 769)
+++ trunk/include/ActiveQt/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = qaxbase.h qaxobject.h qaxscript.h qaxselect.h qaxwidget.h qaxaggregated.h qaxbindable.h qaxfactory.h qaxtypes.h ../../../../../../../../../../../../../../../../../../../../../include/ActiveQt/ActiveQt 
-SYNCQT.HEADER_CLASSES = ../../../include/ActiveQt/QAxBase ../../../include/ActiveQt/QAxObject ../../../include/ActiveQt/QAxScriptEngine ../../../include/ActiveQt/QAxScript ../../../include/ActiveQt/QAxScriptManager ../../../include/ActiveQt/QAxSelect ../../../include/ActiveQt/QAxWidget ../../../include/ActiveQt/QAxAggregated ../../../include/ActiveQt/QAxBindable ../../../include/ActiveQt/QAxFactory ../../../include/ActiveQt/QAxClass 
+SYNCQT.HEADER_FILES = ../activeqt/container/qaxbase.h ../activeqt/container/qaxobject.h ../activeqt/container/qaxscript.h ../activeqt/container/qaxselect.h ../activeqt/container/qaxwidget.h ../activeqt/shared/qaxtypes.h ../activeqt/control/qaxaggregated.h ../activeqt/control/qaxbindable.h ../activeqt/control/qaxfactory.h ../../include/ActiveQt/ActiveQt 
+SYNCQT.HEADER_CLASSES = ../../include/ActiveQt/QAxBase ../../include/ActiveQt/QAxObject ../../include/ActiveQt/QAxScriptEngine ../../include/ActiveQt/QAxScript ../../include/ActiveQt/QAxScriptManager ../../include/ActiveQt/QAxSelect ../../include/ActiveQt/QAxWidget ../../include/ActiveQt/QAxAggregated ../../include/ActiveQt/QAxBindable ../../include/ActiveQt/QAxFactory ../../include/ActiveQt/QAxClass 
 SYNCQT.PRIVATE_HEADER_FILES = 
Index: trunk/include/Qt/q3accel.h
===================================================================
--- trunk/include/Qt/q3accel.h	(revision 769)
+++ trunk/include/Qt/q3accel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3accel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3accel.h"
Index: trunk/include/Qt/q3action.h
===================================================================
--- trunk/include/Qt/q3action.h	(revision 769)
+++ trunk/include/Qt/q3action.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3action.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3action.h"
Index: trunk/include/Qt/q3asciicache.h
===================================================================
--- trunk/include/Qt/q3asciicache.h	(revision 769)
+++ trunk/include/Qt/q3asciicache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3asciicache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3asciicache.h"
Index: trunk/include/Qt/q3asciidict.h
===================================================================
--- trunk/include/Qt/q3asciidict.h	(revision 769)
+++ trunk/include/Qt/q3asciidict.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3asciidict.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3asciidict.h"
Index: trunk/include/Qt/q3boxlayout.h
===================================================================
--- trunk/include/Qt/q3boxlayout.h	(revision 769)
+++ trunk/include/Qt/q3boxlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3boxlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3boxlayout.h"
Index: trunk/include/Qt/q3button.h
===================================================================
--- trunk/include/Qt/q3button.h	(revision 769)
+++ trunk/include/Qt/q3button.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3button.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3button.h"
Index: trunk/include/Qt/q3buttongroup.h
===================================================================
--- trunk/include/Qt/q3buttongroup.h	(revision 769)
+++ trunk/include/Qt/q3buttongroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3buttongroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3buttongroup.h"
Index: trunk/include/Qt/q3cache.h
===================================================================
--- trunk/include/Qt/q3cache.h	(revision 769)
+++ trunk/include/Qt/q3cache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3cache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3cache.h"
Index: trunk/include/Qt/q3canvas.h
===================================================================
--- trunk/include/Qt/q3canvas.h	(revision 769)
+++ trunk/include/Qt/q3canvas.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/canvas/q3canvas.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3canvas.h"
Index: trunk/include/Qt/q3cleanuphandler.h
===================================================================
--- trunk/include/Qt/q3cleanuphandler.h	(revision 769)
+++ trunk/include/Qt/q3cleanuphandler.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3cleanuphandler.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3cleanuphandler.h"
Index: trunk/include/Qt/q3combobox.h
===================================================================
--- trunk/include/Qt/q3combobox.h	(revision 769)
+++ trunk/include/Qt/q3combobox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3combobox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3combobox.h"
Index: trunk/include/Qt/q3cstring.h
===================================================================
--- trunk/include/Qt/q3cstring.h	(revision 769)
+++ trunk/include/Qt/q3cstring.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3cstring.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3cstring.h"
Index: trunk/include/Qt/q3databrowser.h
===================================================================
--- trunk/include/Qt/q3databrowser.h	(revision 769)
+++ trunk/include/Qt/q3databrowser.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3databrowser.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3databrowser.h"
Index: trunk/include/Qt/q3datatable.h
===================================================================
--- trunk/include/Qt/q3datatable.h	(revision 769)
+++ trunk/include/Qt/q3datatable.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3datatable.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3datatable.h"
Index: trunk/include/Qt/q3dataview.h
===================================================================
--- trunk/include/Qt/q3dataview.h	(revision 769)
+++ trunk/include/Qt/q3dataview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3dataview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dataview.h"
Index: trunk/include/Qt/q3datetimeedit.h
===================================================================
--- trunk/include/Qt/q3datetimeedit.h	(revision 769)
+++ trunk/include/Qt/q3datetimeedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3datetimeedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3datetimeedit.h"
Index: trunk/include/Qt/q3deepcopy.h
===================================================================
--- trunk/include/Qt/q3deepcopy.h	(revision 769)
+++ trunk/include/Qt/q3deepcopy.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3deepcopy.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3deepcopy.h"
Index: trunk/include/Qt/q3dict.h
===================================================================
--- trunk/include/Qt/q3dict.h	(revision 769)
+++ trunk/include/Qt/q3dict.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3dict.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dict.h"
Index: trunk/include/Qt/q3dns.h
===================================================================
--- trunk/include/Qt/q3dns.h	(revision 769)
+++ trunk/include/Qt/q3dns.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3dns.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dns.h"
Index: trunk/include/Qt/q3dockarea.h
===================================================================
--- trunk/include/Qt/q3dockarea.h	(revision 769)
+++ trunk/include/Qt/q3dockarea.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3dockarea.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dockarea.h"
Index: trunk/include/Qt/q3dockwindow.h
===================================================================
--- trunk/include/Qt/q3dockwindow.h	(revision 769)
+++ trunk/include/Qt/q3dockwindow.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3dockwindow.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dockwindow.h"
Index: trunk/include/Qt/q3dragobject.h
===================================================================
--- trunk/include/Qt/q3dragobject.h	(revision 769)
+++ trunk/include/Qt/q3dragobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3dragobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dragobject.h"
Index: trunk/include/Qt/q3dropsite.h
===================================================================
--- trunk/include/Qt/q3dropsite.h	(revision 769)
+++ trunk/include/Qt/q3dropsite.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3dropsite.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3dropsite.h"
Index: trunk/include/Qt/q3editorfactory.h
===================================================================
--- trunk/include/Qt/q3editorfactory.h	(revision 769)
+++ trunk/include/Qt/q3editorfactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3editorfactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3editorfactory.h"
Index: trunk/include/Qt/q3filedialog.h
===================================================================
--- trunk/include/Qt/q3filedialog.h	(revision 769)
+++ trunk/include/Qt/q3filedialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/dialogs/q3filedialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3filedialog.h"
Index: trunk/include/Qt/q3frame.h
===================================================================
--- trunk/include/Qt/q3frame.h	(revision 769)
+++ trunk/include/Qt/q3frame.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3frame.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3frame.h"
Index: trunk/include/Qt/q3ftp.h
===================================================================
--- trunk/include/Qt/q3ftp.h	(revision 769)
+++ trunk/include/Qt/q3ftp.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3ftp.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ftp.h"
Index: trunk/include/Qt/q3garray.h
===================================================================
--- trunk/include/Qt/q3garray.h	(revision 769)
+++ trunk/include/Qt/q3garray.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3garray.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3garray.h"
Index: trunk/include/Qt/q3gcache.h
===================================================================
--- trunk/include/Qt/q3gcache.h	(revision 769)
+++ trunk/include/Qt/q3gcache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3gcache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3gcache.h"
Index: trunk/include/Qt/q3gdict.h
===================================================================
--- trunk/include/Qt/q3gdict.h	(revision 769)
+++ trunk/include/Qt/q3gdict.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3gdict.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3gdict.h"
Index: trunk/include/Qt/q3glist.h
===================================================================
--- trunk/include/Qt/q3glist.h	(revision 769)
+++ trunk/include/Qt/q3glist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3glist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3glist.h"
Index: trunk/include/Qt/q3grid.h
===================================================================
--- trunk/include/Qt/q3grid.h	(revision 769)
+++ trunk/include/Qt/q3grid.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3grid.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3grid.h"
Index: trunk/include/Qt/q3gridlayout.h
===================================================================
--- trunk/include/Qt/q3gridlayout.h	(revision 769)
+++ trunk/include/Qt/q3gridlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3gridlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3gridlayout.h"
Index: trunk/include/Qt/q3gridview.h
===================================================================
--- trunk/include/Qt/q3gridview.h	(revision 769)
+++ trunk/include/Qt/q3gridview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3gridview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3gridview.h"
Index: trunk/include/Qt/q3groupbox.h
===================================================================
--- trunk/include/Qt/q3groupbox.h	(revision 769)
+++ trunk/include/Qt/q3groupbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3groupbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3groupbox.h"
Index: trunk/include/Qt/q3gvector.h
===================================================================
--- trunk/include/Qt/q3gvector.h	(revision 769)
+++ trunk/include/Qt/q3gvector.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3gvector.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3gvector.h"
Index: trunk/include/Qt/q3hbox.h
===================================================================
--- trunk/include/Qt/q3hbox.h	(revision 769)
+++ trunk/include/Qt/q3hbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3hbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3hbox.h"
Index: trunk/include/Qt/q3header.h
===================================================================
--- trunk/include/Qt/q3header.h	(revision 769)
+++ trunk/include/Qt/q3header.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3header.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3header.h"
Index: trunk/include/Qt/q3hgroupbox.h
===================================================================
--- trunk/include/Qt/q3hgroupbox.h	(revision 769)
+++ trunk/include/Qt/q3hgroupbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3hgroupbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3hgroupbox.h"
Index: trunk/include/Qt/q3http.h
===================================================================
--- trunk/include/Qt/q3http.h	(revision 769)
+++ trunk/include/Qt/q3http.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3http.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3http.h"
Index: trunk/include/Qt/q3iconview.h
===================================================================
--- trunk/include/Qt/q3iconview.h	(revision 769)
+++ trunk/include/Qt/q3iconview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/itemviews/q3iconview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3iconview.h"
Index: trunk/include/Qt/q3intcache.h
===================================================================
--- trunk/include/Qt/q3intcache.h	(revision 769)
+++ trunk/include/Qt/q3intcache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3intcache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3intcache.h"
Index: trunk/include/Qt/q3intdict.h
===================================================================
--- trunk/include/Qt/q3intdict.h	(revision 769)
+++ trunk/include/Qt/q3intdict.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3intdict.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3intdict.h"
Index: trunk/include/Qt/q3listbox.h
===================================================================
--- trunk/include/Qt/q3listbox.h	(revision 769)
+++ trunk/include/Qt/q3listbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/itemviews/q3listbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3listbox.h"
Index: trunk/include/Qt/q3listview.h
===================================================================
--- trunk/include/Qt/q3listview.h	(revision 769)
+++ trunk/include/Qt/q3listview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/itemviews/q3listview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3listview.h"
Index: trunk/include/Qt/q3localfs.h
===================================================================
--- trunk/include/Qt/q3localfs.h	(revision 769)
+++ trunk/include/Qt/q3localfs.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3localfs.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3localfs.h"
Index: trunk/include/Qt/q3mainwindow.h
===================================================================
--- trunk/include/Qt/q3mainwindow.h	(revision 769)
+++ trunk/include/Qt/q3mainwindow.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3mainwindow.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3mainwindow.h"
Index: trunk/include/Qt/q3memarray.h
===================================================================
--- trunk/include/Qt/q3memarray.h	(revision 769)
+++ trunk/include/Qt/q3memarray.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3memarray.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3memarray.h"
Index: trunk/include/Qt/q3mimefactory.h
===================================================================
--- trunk/include/Qt/q3mimefactory.h	(revision 769)
+++ trunk/include/Qt/q3mimefactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3mimefactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3mimefactory.h"
Index: trunk/include/Qt/q3multilineedit.h
===================================================================
--- trunk/include/Qt/q3multilineedit.h	(revision 769)
+++ trunk/include/Qt/q3multilineedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3multilineedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3multilineedit.h"
Index: trunk/include/Qt/q3network.h
===================================================================
--- trunk/include/Qt/q3network.h	(revision 769)
+++ trunk/include/Qt/q3network.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3network.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3network.h"
Index: trunk/include/Qt/q3networkprotocol.h
===================================================================
--- trunk/include/Qt/q3networkprotocol.h	(revision 769)
+++ trunk/include/Qt/q3networkprotocol.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3networkprotocol.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3networkprotocol.h"
Index: trunk/include/Qt/q3objectdict.h
===================================================================
--- trunk/include/Qt/q3objectdict.h	(revision 769)
+++ trunk/include/Qt/q3objectdict.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3objectdict.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3objectdict.h"
Index: trunk/include/Qt/q3paintdevicemetrics.h
===================================================================
--- trunk/include/Qt/q3paintdevicemetrics.h	(revision 769)
+++ trunk/include/Qt/q3paintdevicemetrics.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/painting/q3paintdevicemetrics.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3paintdevicemetrics.h"
Index: trunk/include/Qt/q3painter.h
===================================================================
--- trunk/include/Qt/q3painter.h	(revision 769)
+++ trunk/include/Qt/q3painter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/painting/q3painter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3painter.h"
Index: trunk/include/Qt/q3picture.h
===================================================================
--- trunk/include/Qt/q3picture.h	(revision 769)
+++ trunk/include/Qt/q3picture.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/painting/q3picture.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3picture.h"
Index: trunk/include/Qt/q3pointarray.h
===================================================================
--- trunk/include/Qt/q3pointarray.h	(revision 769)
+++ trunk/include/Qt/q3pointarray.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/painting/q3pointarray.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3pointarray.h"
Index: trunk/include/Qt/q3polygonscanner.h
===================================================================
--- trunk/include/Qt/q3polygonscanner.h	(revision 769)
+++ trunk/include/Qt/q3polygonscanner.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3polygonscanner.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3polygonscanner.h"
Index: trunk/include/Qt/q3popupmenu.h
===================================================================
--- trunk/include/Qt/q3popupmenu.h	(revision 769)
+++ trunk/include/Qt/q3popupmenu.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3popupmenu.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3popupmenu.h"
Index: trunk/include/Qt/q3process.h
===================================================================
--- trunk/include/Qt/q3process.h	(revision 769)
+++ trunk/include/Qt/q3process.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/q3process.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3process.h"
Index: trunk/include/Qt/q3progressbar.h
===================================================================
--- trunk/include/Qt/q3progressbar.h	(revision 769)
+++ trunk/include/Qt/q3progressbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3progressbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3progressbar.h"
Index: trunk/include/Qt/q3progressdialog.h
===================================================================
--- trunk/include/Qt/q3progressdialog.h	(revision 769)
+++ trunk/include/Qt/q3progressdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/dialogs/q3progressdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3progressdialog.h"
Index: trunk/include/Qt/q3ptrcollection.h
===================================================================
--- trunk/include/Qt/q3ptrcollection.h	(revision 769)
+++ trunk/include/Qt/q3ptrcollection.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3ptrcollection.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ptrcollection.h"
Index: trunk/include/Qt/q3ptrdict.h
===================================================================
--- trunk/include/Qt/q3ptrdict.h	(revision 769)
+++ trunk/include/Qt/q3ptrdict.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3ptrdict.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ptrdict.h"
Index: trunk/include/Qt/q3ptrlist.h
===================================================================
--- trunk/include/Qt/q3ptrlist.h	(revision 769)
+++ trunk/include/Qt/q3ptrlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3ptrlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ptrlist.h"
Index: trunk/include/Qt/q3ptrqueue.h
===================================================================
--- trunk/include/Qt/q3ptrqueue.h	(revision 769)
+++ trunk/include/Qt/q3ptrqueue.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3ptrqueue.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ptrqueue.h"
Index: trunk/include/Qt/q3ptrstack.h
===================================================================
--- trunk/include/Qt/q3ptrstack.h	(revision 769)
+++ trunk/include/Qt/q3ptrstack.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3ptrstack.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ptrstack.h"
Index: trunk/include/Qt/q3ptrvector.h
===================================================================
--- trunk/include/Qt/q3ptrvector.h	(revision 769)
+++ trunk/include/Qt/q3ptrvector.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3ptrvector.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3ptrvector.h"
Index: trunk/include/Qt/q3rangecontrol.h
===================================================================
--- trunk/include/Qt/q3rangecontrol.h	(revision 769)
+++ trunk/include/Qt/q3rangecontrol.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3rangecontrol.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3rangecontrol.h"
Index: trunk/include/Qt/q3scrollview.h
===================================================================
--- trunk/include/Qt/q3scrollview.h	(revision 769)
+++ trunk/include/Qt/q3scrollview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3scrollview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3scrollview.h"
Index: trunk/include/Qt/q3semaphore.h
===================================================================
--- trunk/include/Qt/q3semaphore.h	(revision 769)
+++ trunk/include/Qt/q3semaphore.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3semaphore.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3semaphore.h"
Index: trunk/include/Qt/q3serversocket.h
===================================================================
--- trunk/include/Qt/q3serversocket.h	(revision 769)
+++ trunk/include/Qt/q3serversocket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3serversocket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3serversocket.h"
Index: trunk/include/Qt/q3shared.h
===================================================================
--- trunk/include/Qt/q3shared.h	(revision 769)
+++ trunk/include/Qt/q3shared.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3shared.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3shared.h"
Index: trunk/include/Qt/q3signal.h
===================================================================
--- trunk/include/Qt/q3signal.h	(revision 769)
+++ trunk/include/Qt/q3signal.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3signal.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3signal.h"
Index: trunk/include/Qt/q3simplerichtext.h
===================================================================
--- trunk/include/Qt/q3simplerichtext.h	(revision 769)
+++ trunk/include/Qt/q3simplerichtext.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3simplerichtext.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3simplerichtext.h"
Index: trunk/include/Qt/q3socket.h
===================================================================
--- trunk/include/Qt/q3socket.h	(revision 769)
+++ trunk/include/Qt/q3socket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3socket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3socket.h"
Index: trunk/include/Qt/q3socketdevice.h
===================================================================
--- trunk/include/Qt/q3socketdevice.h	(revision 769)
+++ trunk/include/Qt/q3socketdevice.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3socketdevice.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3socketdevice.h"
Index: trunk/include/Qt/q3sortedlist.h
===================================================================
--- trunk/include/Qt/q3sortedlist.h	(revision 769)
+++ trunk/include/Qt/q3sortedlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3sortedlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sortedlist.h"
Index: trunk/include/Qt/q3sqlcursor.h
===================================================================
--- trunk/include/Qt/q3sqlcursor.h	(revision 769)
+++ trunk/include/Qt/q3sqlcursor.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqlcursor.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqlcursor.h"
Index: trunk/include/Qt/q3sqleditorfactory.h
===================================================================
--- trunk/include/Qt/q3sqleditorfactory.h	(revision 769)
+++ trunk/include/Qt/q3sqleditorfactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqleditorfactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqleditorfactory.h"
Index: trunk/include/Qt/q3sqlfieldinfo.h
===================================================================
--- trunk/include/Qt/q3sqlfieldinfo.h	(revision 769)
+++ trunk/include/Qt/q3sqlfieldinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqlfieldinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqlfieldinfo.h"
Index: trunk/include/Qt/q3sqlform.h
===================================================================
--- trunk/include/Qt/q3sqlform.h	(revision 769)
+++ trunk/include/Qt/q3sqlform.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqlform.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqlform.h"
Index: trunk/include/Qt/q3sqlpropertymap.h
===================================================================
--- trunk/include/Qt/q3sqlpropertymap.h	(revision 769)
+++ trunk/include/Qt/q3sqlpropertymap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqlpropertymap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqlpropertymap.h"
Index: trunk/include/Qt/q3sqlrecordinfo.h
===================================================================
--- trunk/include/Qt/q3sqlrecordinfo.h	(revision 769)
+++ trunk/include/Qt/q3sqlrecordinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqlrecordinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqlrecordinfo.h"
Index: trunk/include/Qt/q3sqlselectcursor.h
===================================================================
--- trunk/include/Qt/q3sqlselectcursor.h	(revision 769)
+++ trunk/include/Qt/q3sqlselectcursor.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/sql/q3sqlselectcursor.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3sqlselectcursor.h"
Index: trunk/include/Qt/q3strlist.h
===================================================================
--- trunk/include/Qt/q3strlist.h	(revision 769)
+++ trunk/include/Qt/q3strlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3strlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3strlist.h"
Index: trunk/include/Qt/q3strvec.h
===================================================================
--- trunk/include/Qt/q3strvec.h	(revision 769)
+++ trunk/include/Qt/q3strvec.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3strvec.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3strvec.h"
Index: trunk/include/Qt/q3stylesheet.h
===================================================================
--- trunk/include/Qt/q3stylesheet.h	(revision 769)
+++ trunk/include/Qt/q3stylesheet.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3stylesheet.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3stylesheet.h"
Index: trunk/include/Qt/q3syntaxhighlighter.h
===================================================================
--- trunk/include/Qt/q3syntaxhighlighter.h	(revision 769)
+++ trunk/include/Qt/q3syntaxhighlighter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3syntaxhighlighter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3syntaxhighlighter.h"
Index: trunk/include/Qt/q3tabdialog.h
===================================================================
--- trunk/include/Qt/q3tabdialog.h	(revision 769)
+++ trunk/include/Qt/q3tabdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/dialogs/q3tabdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3tabdialog.h"
Index: trunk/include/Qt/q3table.h
===================================================================
--- trunk/include/Qt/q3table.h	(revision 769)
+++ trunk/include/Qt/q3table.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/itemviews/q3table.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3table.h"
Index: trunk/include/Qt/q3textbrowser.h
===================================================================
--- trunk/include/Qt/q3textbrowser.h	(revision 769)
+++ trunk/include/Qt/q3textbrowser.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3textbrowser.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3textbrowser.h"
Index: trunk/include/Qt/q3textedit.h
===================================================================
--- trunk/include/Qt/q3textedit.h	(revision 769)
+++ trunk/include/Qt/q3textedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3textedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3textedit.h"
Index: trunk/include/Qt/q3textstream.h
===================================================================
--- trunk/include/Qt/q3textstream.h	(revision 769)
+++ trunk/include/Qt/q3textstream.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3textstream.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3textstream.h"
Index: trunk/include/Qt/q3textview.h
===================================================================
--- trunk/include/Qt/q3textview.h	(revision 769)
+++ trunk/include/Qt/q3textview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/text/q3textview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3textview.h"
Index: trunk/include/Qt/q3tl.h
===================================================================
--- trunk/include/Qt/q3tl.h	(revision 769)
+++ trunk/include/Qt/q3tl.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3tl.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3tl.h"
Index: trunk/include/Qt/q3toolbar.h
===================================================================
--- trunk/include/Qt/q3toolbar.h	(revision 769)
+++ trunk/include/Qt/q3toolbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3toolbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3toolbar.h"
Index: trunk/include/Qt/q3url.h
===================================================================
--- trunk/include/Qt/q3url.h	(revision 769)
+++ trunk/include/Qt/q3url.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3url.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3url.h"
Index: trunk/include/Qt/q3urloperator.h
===================================================================
--- trunk/include/Qt/q3urloperator.h	(revision 769)
+++ trunk/include/Qt/q3urloperator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/network/q3urloperator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3urloperator.h"
Index: trunk/include/Qt/q3valuelist.h
===================================================================
--- trunk/include/Qt/q3valuelist.h	(revision 769)
+++ trunk/include/Qt/q3valuelist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3valuelist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3valuelist.h"
Index: trunk/include/Qt/q3valuestack.h
===================================================================
--- trunk/include/Qt/q3valuestack.h	(revision 769)
+++ trunk/include/Qt/q3valuestack.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3valuestack.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3valuestack.h"
Index: trunk/include/Qt/q3valuevector.h
===================================================================
--- trunk/include/Qt/q3valuevector.h	(revision 769)
+++ trunk/include/Qt/q3valuevector.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/tools/q3valuevector.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3valuevector.h"
Index: trunk/include/Qt/q3vbox.h
===================================================================
--- trunk/include/Qt/q3vbox.h	(revision 769)
+++ trunk/include/Qt/q3vbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3vbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3vbox.h"
Index: trunk/include/Qt/q3vgroupbox.h
===================================================================
--- trunk/include/Qt/q3vgroupbox.h	(revision 769)
+++ trunk/include/Qt/q3vgroupbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3vgroupbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3vgroupbox.h"
Index: trunk/include/Qt/q3whatsthis.h
===================================================================
--- trunk/include/Qt/q3whatsthis.h	(revision 769)
+++ trunk/include/Qt/q3whatsthis.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3whatsthis.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3whatsthis.h"
Index: trunk/include/Qt/q3widgetstack.h
===================================================================
--- trunk/include/Qt/q3widgetstack.h	(revision 769)
+++ trunk/include/Qt/q3widgetstack.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/widgets/q3widgetstack.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3widgetstack.h"
Index: trunk/include/Qt/q3wizard.h
===================================================================
--- trunk/include/Qt/q3wizard.h	(revision 769)
+++ trunk/include/Qt/q3wizard.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/dialogs/q3wizard.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/q3wizard.h"
Index: trunk/include/Qt/qabstractanimation.h
===================================================================
--- trunk/include/Qt/qabstractanimation.h	(revision 769)
+++ trunk/include/Qt/qabstractanimation.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qabstractanimation.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qabstractanimation.h"
Index: trunk/include/Qt/qabstractbutton.h
===================================================================
--- trunk/include/Qt/qabstractbutton.h	(revision 769)
+++ trunk/include/Qt/qabstractbutton.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qabstractbutton.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractbutton.h"
Index: trunk/include/Qt/qabstracteventdispatcher.h
===================================================================
--- trunk/include/Qt/qabstracteventdispatcher.h	(revision 769)
+++ trunk/include/Qt/qabstracteventdispatcher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qabstracteventdispatcher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qabstracteventdispatcher.h"
Index: trunk/include/Qt/qabstractfileengine.h
===================================================================
--- trunk/include/Qt/qabstractfileengine.h	(revision 769)
+++ trunk/include/Qt/qabstractfileengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qabstractfileengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qabstractfileengine.h"
Index: trunk/include/Qt/qabstractfontengine_qws.h
===================================================================
--- trunk/include/Qt/qabstractfontengine_qws.h	(revision 769)
+++ trunk/include/Qt/qabstractfontengine_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qabstractfontengine_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractfontengine_qws.h"
Index: trunk/include/Qt/qabstractitemdelegate.h
===================================================================
--- trunk/include/Qt/qabstractitemdelegate.h	(revision 769)
+++ trunk/include/Qt/qabstractitemdelegate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qabstractitemdelegate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractitemdelegate.h"
Index: trunk/include/Qt/qabstractitemmodel.h
===================================================================
--- trunk/include/Qt/qabstractitemmodel.h	(revision 769)
+++ trunk/include/Qt/qabstractitemmodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qabstractitemmodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qabstractitemmodel.h"
Index: trunk/include/Qt/qabstractitemview.h
===================================================================
--- trunk/include/Qt/qabstractitemview.h	(revision 769)
+++ trunk/include/Qt/qabstractitemview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qabstractitemview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractitemview.h"
Index: trunk/include/Qt/qabstractmessagehandler.h
===================================================================
--- trunk/include/Qt/qabstractmessagehandler.h	(revision 769)
+++ trunk/include/Qt/qabstractmessagehandler.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qabstractmessagehandler.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qabstractmessagehandler.h"
Index: trunk/include/Qt/qabstractnetworkcache.h
===================================================================
--- trunk/include/Qt/qabstractnetworkcache.h	(revision 769)
+++ trunk/include/Qt/qabstractnetworkcache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qabstractnetworkcache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qabstractnetworkcache.h"
Index: trunk/include/Qt/qabstractpagesetupdialog.h
===================================================================
--- trunk/include/Qt/qabstractpagesetupdialog.h	(revision 769)
+++ trunk/include/Qt/qabstractpagesetupdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qabstractpagesetupdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractpagesetupdialog.h"
Index: trunk/include/Qt/qabstractprintdialog.h
===================================================================
--- trunk/include/Qt/qabstractprintdialog.h	(revision 769)
+++ trunk/include/Qt/qabstractprintdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qabstractprintdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractprintdialog.h"
Index: trunk/include/Qt/qabstractproxymodel.h
===================================================================
--- trunk/include/Qt/qabstractproxymodel.h	(revision 769)
+++ trunk/include/Qt/qabstractproxymodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qabstractproxymodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractproxymodel.h"
Index: trunk/include/Qt/qabstractscrollarea.h
===================================================================
--- trunk/include/Qt/qabstractscrollarea.h	(revision 769)
+++ trunk/include/Qt/qabstractscrollarea.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qabstractscrollarea.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractscrollarea.h"
Index: trunk/include/Qt/qabstractslider.h
===================================================================
--- trunk/include/Qt/qabstractslider.h	(revision 769)
+++ trunk/include/Qt/qabstractslider.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qabstractslider.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractslider.h"
Index: trunk/include/Qt/qabstractsocket.h
===================================================================
--- trunk/include/Qt/qabstractsocket.h	(revision 769)
+++ trunk/include/Qt/qabstractsocket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/socket/qabstractsocket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qabstractsocket.h"
Index: trunk/include/Qt/qabstractspinbox.h
===================================================================
--- trunk/include/Qt/qabstractspinbox.h	(revision 769)
+++ trunk/include/Qt/qabstractspinbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qabstractspinbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstractspinbox.h"
Index: trunk/include/Qt/qabstractstate.h
===================================================================
--- trunk/include/Qt/qabstractstate.h	(revision 769)
+++ trunk/include/Qt/qabstractstate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qabstractstate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qabstractstate.h"
Index: trunk/include/Qt/qabstracttextdocumentlayout.h
===================================================================
--- trunk/include/Qt/qabstracttextdocumentlayout.h	(revision 769)
+++ trunk/include/Qt/qabstracttextdocumentlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qabstracttextdocumentlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qabstracttextdocumentlayout.h"
Index: trunk/include/Qt/qabstracttransition.h
===================================================================
--- trunk/include/Qt/qabstracttransition.h	(revision 769)
+++ trunk/include/Qt/qabstracttransition.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qabstracttransition.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qabstracttransition.h"
Index: trunk/include/Qt/qabstracturiresolver.h
===================================================================
--- trunk/include/Qt/qabstracturiresolver.h	(revision 769)
+++ trunk/include/Qt/qabstracturiresolver.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qabstracturiresolver.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qabstracturiresolver.h"
Index: trunk/include/Qt/qabstractvideobuffer.h
===================================================================
--- trunk/include/Qt/qabstractvideobuffer.h	(revision 769)
+++ trunk/include/Qt/qabstractvideobuffer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/video/qabstractvideobuffer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qabstractvideobuffer.h"
Index: trunk/include/Qt/qabstractvideosurface.h
===================================================================
--- trunk/include/Qt/qabstractvideosurface.h	(revision 769)
+++ trunk/include/Qt/qabstractvideosurface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/video/qabstractvideosurface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qabstractvideosurface.h"
Index: trunk/include/Qt/qabstractxmlnodemodel.h
===================================================================
--- trunk/include/Qt/qabstractxmlnodemodel.h	(revision 769)
+++ trunk/include/Qt/qabstractxmlnodemodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qabstractxmlnodemodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qabstractxmlnodemodel.h"
Index: trunk/include/Qt/qabstractxmlreceiver.h
===================================================================
--- trunk/include/Qt/qabstractxmlreceiver.h	(revision 769)
+++ trunk/include/Qt/qabstractxmlreceiver.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qabstractxmlreceiver.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qabstractxmlreceiver.h"
Index: trunk/include/Qt/qaccessible.h
===================================================================
--- trunk/include/Qt/qaccessible.h	(revision 769)
+++ trunk/include/Qt/qaccessible.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/accessible/qaccessible.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaccessible.h"
Index: trunk/include/Qt/qaccessible2.h
===================================================================
--- trunk/include/Qt/qaccessible2.h	(revision 769)
+++ trunk/include/Qt/qaccessible2.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/accessible/qaccessible2.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaccessible2.h"
Index: trunk/include/Qt/qaccessiblebridge.h
===================================================================
--- trunk/include/Qt/qaccessiblebridge.h	(revision 769)
+++ trunk/include/Qt/qaccessiblebridge.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/accessible/qaccessiblebridge.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaccessiblebridge.h"
Index: trunk/include/Qt/qaccessibleobject.h
===================================================================
--- trunk/include/Qt/qaccessibleobject.h	(revision 769)
+++ trunk/include/Qt/qaccessibleobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/accessible/qaccessibleobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaccessibleobject.h"
Index: trunk/include/Qt/qaccessibleplugin.h
===================================================================
--- trunk/include/Qt/qaccessibleplugin.h	(revision 769)
+++ trunk/include/Qt/qaccessibleplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/accessible/qaccessibleplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaccessibleplugin.h"
Index: trunk/include/Qt/qaccessiblewidget.h
===================================================================
--- trunk/include/Qt/qaccessiblewidget.h	(revision 769)
+++ trunk/include/Qt/qaccessiblewidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/accessible/qaccessiblewidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaccessiblewidget.h"
Index: trunk/include/Qt/qaction.h
===================================================================
--- trunk/include/Qt/qaction.h	(revision 769)
+++ trunk/include/Qt/qaction.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qaction.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qaction.h"
Index: trunk/include/Qt/qactiongroup.h
===================================================================
--- trunk/include/Qt/qactiongroup.h	(revision 769)
+++ trunk/include/Qt/qactiongroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qactiongroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qactiongroup.h"
Index: trunk/include/Qt/qalgorithms.h
===================================================================
--- trunk/include/Qt/qalgorithms.h	(revision 769)
+++ trunk/include/Qt/qalgorithms.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qalgorithms.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qalgorithms.h"
Index: trunk/include/Qt/qanimationgroup.h
===================================================================
--- trunk/include/Qt/qanimationgroup.h	(revision 769)
+++ trunk/include/Qt/qanimationgroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qanimationgroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qanimationgroup.h"
Index: trunk/include/Qt/qapplication.h
===================================================================
--- trunk/include/Qt/qapplication.h	(revision 769)
+++ trunk/include/Qt/qapplication.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qapplication.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qapplication.h"
Index: trunk/include/Qt/qatomic.h
===================================================================
--- trunk/include/Qt/qatomic.h	(revision 769)
+++ trunk/include/Qt/qatomic.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qatomic.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic.h"
Index: trunk/include/Qt/qatomic_alpha.h
===================================================================
--- trunk/include/Qt/qatomic_alpha.h	(revision 769)
+++ trunk/include/Qt/qatomic_alpha.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_alpha.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_alpha.h"
Index: trunk/include/Qt/qatomic_arch.h
===================================================================
--- trunk/include/Qt/qatomic_arch.h	(revision 769)
+++ trunk/include/Qt/qatomic_arch.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_arch.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_arch.h"
Index: trunk/include/Qt/qatomic_arm.h
===================================================================
--- trunk/include/Qt/qatomic_arm.h	(revision 769)
+++ trunk/include/Qt/qatomic_arm.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_arm.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_arm.h"
Index: trunk/include/Qt/qatomic_armv6.h
===================================================================
--- trunk/include/Qt/qatomic_armv6.h	(revision 769)
+++ trunk/include/Qt/qatomic_armv6.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_armv6.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_armv6.h"
Index: trunk/include/Qt/qatomic_avr32.h
===================================================================
--- trunk/include/Qt/qatomic_avr32.h	(revision 769)
+++ trunk/include/Qt/qatomic_avr32.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_avr32.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_avr32.h"
Index: trunk/include/Qt/qatomic_bfin.h
===================================================================
--- trunk/include/Qt/qatomic_bfin.h	(revision 769)
+++ trunk/include/Qt/qatomic_bfin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_bfin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_bfin.h"
Index: trunk/include/Qt/qatomic_bootstrap.h
===================================================================
--- trunk/include/Qt/qatomic_bootstrap.h	(revision 769)
+++ trunk/include/Qt/qatomic_bootstrap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_bootstrap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_bootstrap.h"
Index: trunk/include/Qt/qatomic_generic.h
===================================================================
--- trunk/include/Qt/qatomic_generic.h	(revision 769)
+++ trunk/include/Qt/qatomic_generic.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_generic.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_generic.h"
Index: trunk/include/Qt/qatomic_i386.h
===================================================================
--- trunk/include/Qt/qatomic_i386.h	(revision 769)
+++ trunk/include/Qt/qatomic_i386.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_i386.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_i386.h"
Index: trunk/include/Qt/qatomic_ia64.h
===================================================================
--- trunk/include/Qt/qatomic_ia64.h	(revision 769)
+++ trunk/include/Qt/qatomic_ia64.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_ia64.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_ia64.h"
Index: trunk/include/Qt/qatomic_macosx.h
===================================================================
--- trunk/include/Qt/qatomic_macosx.h	(revision 769)
+++ trunk/include/Qt/qatomic_macosx.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_macosx.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_macosx.h"
Index: trunk/include/Qt/qatomic_mips.h
===================================================================
--- trunk/include/Qt/qatomic_mips.h	(revision 769)
+++ trunk/include/Qt/qatomic_mips.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_mips.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_mips.h"
Index: trunk/include/Qt/qatomic_parisc.h
===================================================================
--- trunk/include/Qt/qatomic_parisc.h	(revision 769)
+++ trunk/include/Qt/qatomic_parisc.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_parisc.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_parisc.h"
Index: trunk/include/Qt/qatomic_powerpc.h
===================================================================
--- trunk/include/Qt/qatomic_powerpc.h	(revision 769)
+++ trunk/include/Qt/qatomic_powerpc.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_powerpc.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_powerpc.h"
Index: trunk/include/Qt/qatomic_s390.h
===================================================================
--- trunk/include/Qt/qatomic_s390.h	(revision 769)
+++ trunk/include/Qt/qatomic_s390.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_s390.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_s390.h"
Index: trunk/include/Qt/qatomic_sh.h
===================================================================
--- trunk/include/Qt/qatomic_sh.h	(revision 769)
+++ trunk/include/Qt/qatomic_sh.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_sh.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_sh.h"
Index: trunk/include/Qt/qatomic_sh4a.h
===================================================================
--- trunk/include/Qt/qatomic_sh4a.h	(revision 769)
+++ trunk/include/Qt/qatomic_sh4a.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_sh4a.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_sh4a.h"
Index: trunk/include/Qt/qatomic_sparc.h
===================================================================
--- trunk/include/Qt/qatomic_sparc.h	(revision 769)
+++ trunk/include/Qt/qatomic_sparc.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_sparc.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_sparc.h"
Index: trunk/include/Qt/qatomic_symbian.h
===================================================================
--- trunk/include/Qt/qatomic_symbian.h	(revision 769)
+++ trunk/include/Qt/qatomic_symbian.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_symbian.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_symbian.h"
Index: trunk/include/Qt/qatomic_vxworks.h
===================================================================
--- trunk/include/Qt/qatomic_vxworks.h	(revision 769)
+++ trunk/include/Qt/qatomic_vxworks.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_vxworks.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_vxworks.h"
Index: trunk/include/Qt/qatomic_windows.h
===================================================================
--- trunk/include/Qt/qatomic_windows.h	(revision 769)
+++ trunk/include/Qt/qatomic_windows.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_windows.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_windows.h"
Index: trunk/include/Qt/qatomic_windowsce.h
===================================================================
--- trunk/include/Qt/qatomic_windowsce.h	(revision 769)
+++ trunk/include/Qt/qatomic_windowsce.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_windowsce.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_windowsce.h"
Index: trunk/include/Qt/qatomic_x86_64.h
===================================================================
--- trunk/include/Qt/qatomic_x86_64.h	(revision 769)
+++ trunk/include/Qt/qatomic_x86_64.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/arch/qatomic_x86_64.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qatomic_x86_64.h"
Index: trunk/include/Qt/qaudio.h
===================================================================
--- trunk/include/Qt/qaudio.h	(revision 769)
+++ trunk/include/Qt/qaudio.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudio.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudio.h"
Index: trunk/include/Qt/qaudiodeviceinfo.h
===================================================================
--- trunk/include/Qt/qaudiodeviceinfo.h	(revision 769)
+++ trunk/include/Qt/qaudiodeviceinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudiodeviceinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudiodeviceinfo.h"
Index: trunk/include/Qt/qaudioengine.h
===================================================================
--- trunk/include/Qt/qaudioengine.h	(revision 769)
+++ trunk/include/Qt/qaudioengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudioengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudioengine.h"
Index: trunk/include/Qt/qaudioengineplugin.h
===================================================================
--- trunk/include/Qt/qaudioengineplugin.h	(revision 769)
+++ trunk/include/Qt/qaudioengineplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudioengineplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudioengineplugin.h"
Index: trunk/include/Qt/qaudioformat.h
===================================================================
--- trunk/include/Qt/qaudioformat.h	(revision 769)
+++ trunk/include/Qt/qaudioformat.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudioformat.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudioformat.h"
Index: trunk/include/Qt/qaudioinput.h
===================================================================
--- trunk/include/Qt/qaudioinput.h	(revision 769)
+++ trunk/include/Qt/qaudioinput.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudioinput.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudioinput.h"
Index: trunk/include/Qt/qaudiooutput.h
===================================================================
--- trunk/include/Qt/qaudiooutput.h	(revision 769)
+++ trunk/include/Qt/qaudiooutput.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/audio/qaudiooutput.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qaudiooutput.h"
Index: trunk/include/Qt/qauthenticator.h
===================================================================
--- trunk/include/Qt/qauthenticator.h	(revision 769)
+++ trunk/include/Qt/qauthenticator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/kernel/qauthenticator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qauthenticator.h"
Index: trunk/include/Qt/qaxaggregated.h
===================================================================
--- trunk/include/Qt/qaxaggregated.h	(revision 769)
+++ trunk/include/Qt/qaxaggregated.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/control/qaxaggregated.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxaggregated.h"
Index: trunk/include/Qt/qaxbase.h
===================================================================
--- trunk/include/Qt/qaxbase.h	(revision 769)
+++ trunk/include/Qt/qaxbase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/container/qaxbase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxbase.h"
Index: trunk/include/Qt/qaxbindable.h
===================================================================
--- trunk/include/Qt/qaxbindable.h	(revision 769)
+++ trunk/include/Qt/qaxbindable.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/control/qaxbindable.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxbindable.h"
Index: trunk/include/Qt/qaxfactory.h
===================================================================
--- trunk/include/Qt/qaxfactory.h	(revision 769)
+++ trunk/include/Qt/qaxfactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/control/qaxfactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxfactory.h"
Index: trunk/include/Qt/qaxobject.h
===================================================================
--- trunk/include/Qt/qaxobject.h	(revision 769)
+++ trunk/include/Qt/qaxobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/container/qaxobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxobject.h"
Index: trunk/include/Qt/qaxscript.h
===================================================================
--- trunk/include/Qt/qaxscript.h	(revision 769)
+++ trunk/include/Qt/qaxscript.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/container/qaxscript.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxscript.h"
Index: trunk/include/Qt/qaxselect.h
===================================================================
--- trunk/include/Qt/qaxselect.h	(revision 769)
+++ trunk/include/Qt/qaxselect.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/container/qaxselect.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxselect.h"
Index: trunk/include/Qt/qaxtypes.h
===================================================================
--- trunk/include/Qt/qaxtypes.h	(revision 769)
+++ trunk/include/Qt/qaxtypes.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/shared/qaxtypes.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxtypes.h"
Index: trunk/include/Qt/qaxwidget.h
===================================================================
--- trunk/include/Qt/qaxwidget.h	(revision 769)
+++ trunk/include/Qt/qaxwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/activeqt/container/qaxwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../ActiveQt/qaxwidget.h"
Index: trunk/include/Qt/qbasicatomic.h
===================================================================
--- trunk/include/Qt/qbasicatomic.h	(revision 769)
+++ trunk/include/Qt/qbasicatomic.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qbasicatomic.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qbasicatomic.h"
Index: trunk/include/Qt/qbasictimer.h
===================================================================
--- trunk/include/Qt/qbasictimer.h	(revision 769)
+++ trunk/include/Qt/qbasictimer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qbasictimer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qbasictimer.h"
Index: trunk/include/Qt/qbenchmark.h
===================================================================
--- trunk/include/Qt/qbenchmark.h	(revision 769)
+++ trunk/include/Qt/qbenchmark.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qbenchmark.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qbenchmark.h"
Index: trunk/include/Qt/qbenchmarkmetric.h
===================================================================
--- trunk/include/Qt/qbenchmarkmetric.h	(revision 846)
+++ trunk/include/Qt/qbenchmarkmetric.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qbenchmarkmetric.h"
Index: trunk/include/Qt/qbitarray.h
===================================================================
--- trunk/include/Qt/qbitarray.h	(revision 769)
+++ trunk/include/Qt/qbitarray.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qbitarray.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qbitarray.h"
Index: trunk/include/Qt/qbitmap.h
===================================================================
--- trunk/include/Qt/qbitmap.h	(revision 769)
+++ trunk/include/Qt/qbitmap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qbitmap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qbitmap.h"
Index: trunk/include/Qt/qboxlayout.h
===================================================================
--- trunk/include/Qt/qboxlayout.h	(revision 769)
+++ trunk/include/Qt/qboxlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qboxlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qboxlayout.h"
Index: trunk/include/Qt/qbrush.h
===================================================================
--- trunk/include/Qt/qbrush.h	(revision 769)
+++ trunk/include/Qt/qbrush.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qbrush.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qbrush.h"
Index: trunk/include/Qt/qbuffer.h
===================================================================
--- trunk/include/Qt/qbuffer.h	(revision 769)
+++ trunk/include/Qt/qbuffer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qbuffer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qbuffer.h"
Index: trunk/include/Qt/qbuttongroup.h
===================================================================
--- trunk/include/Qt/qbuttongroup.h	(revision 769)
+++ trunk/include/Qt/qbuttongroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qbuttongroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qbuttongroup.h"
Index: trunk/include/Qt/qbytearray.h
===================================================================
--- trunk/include/Qt/qbytearray.h	(revision 769)
+++ trunk/include/Qt/qbytearray.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qbytearray.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qbytearray.h"
Index: trunk/include/Qt/qbytearraymatcher.h
===================================================================
--- trunk/include/Qt/qbytearraymatcher.h	(revision 769)
+++ trunk/include/Qt/qbytearraymatcher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qbytearraymatcher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qbytearraymatcher.h"
Index: trunk/include/Qt/qcache.h
===================================================================
--- trunk/include/Qt/qcache.h	(revision 769)
+++ trunk/include/Qt/qcache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qcache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qcache.h"
Index: trunk/include/Qt/qcalendarwidget.h
===================================================================
--- trunk/include/Qt/qcalendarwidget.h	(revision 769)
+++ trunk/include/Qt/qcalendarwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qcalendarwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcalendarwidget.h"
Index: trunk/include/Qt/qcdestyle.h
===================================================================
--- trunk/include/Qt/qcdestyle.h	(revision 769)
+++ trunk/include/Qt/qcdestyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qcdestyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcdestyle.h"
Index: trunk/include/Qt/qchar.h
===================================================================
--- trunk/include/Qt/qchar.h	(revision 769)
+++ trunk/include/Qt/qchar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qchar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qchar.h"
Index: trunk/include/Qt/qcheckbox.h
===================================================================
--- trunk/include/Qt/qcheckbox.h	(revision 769)
+++ trunk/include/Qt/qcheckbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qcheckbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcheckbox.h"
Index: trunk/include/Qt/qcleanlooksstyle.h
===================================================================
--- trunk/include/Qt/qcleanlooksstyle.h	(revision 769)
+++ trunk/include/Qt/qcleanlooksstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qcleanlooksstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcleanlooksstyle.h"
Index: trunk/include/Qt/qclipboard.h
===================================================================
--- trunk/include/Qt/qclipboard.h	(revision 769)
+++ trunk/include/Qt/qclipboard.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qclipboard.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qclipboard.h"
Index: trunk/include/Qt/qcolor.h
===================================================================
--- trunk/include/Qt/qcolor.h	(revision 769)
+++ trunk/include/Qt/qcolor.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qcolor.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcolor.h"
Index: trunk/include/Qt/qcolordialog.h
===================================================================
--- trunk/include/Qt/qcolordialog.h	(revision 769)
+++ trunk/include/Qt/qcolordialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qcolordialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcolordialog.h"
Index: trunk/include/Qt/qcolormap.h
===================================================================
--- trunk/include/Qt/qcolormap.h	(revision 769)
+++ trunk/include/Qt/qcolormap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qcolormap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcolormap.h"
Index: trunk/include/Qt/qcolumnview.h
===================================================================
--- trunk/include/Qt/qcolumnview.h	(revision 769)
+++ trunk/include/Qt/qcolumnview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qcolumnview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcolumnview.h"
Index: trunk/include/Qt/qcombobox.h
===================================================================
--- trunk/include/Qt/qcombobox.h	(revision 769)
+++ trunk/include/Qt/qcombobox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qcombobox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcombobox.h"
Index: trunk/include/Qt/qcommandlinkbutton.h
===================================================================
--- trunk/include/Qt/qcommandlinkbutton.h	(revision 769)
+++ trunk/include/Qt/qcommandlinkbutton.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qcommandlinkbutton.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcommandlinkbutton.h"
Index: trunk/include/Qt/qcommonstyle.h
===================================================================
--- trunk/include/Qt/qcommonstyle.h	(revision 769)
+++ trunk/include/Qt/qcommonstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qcommonstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcommonstyle.h"
Index: trunk/include/Qt/qcompleter.h
===================================================================
--- trunk/include/Qt/qcompleter.h	(revision 769)
+++ trunk/include/Qt/qcompleter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/util/qcompleter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcompleter.h"
Index: trunk/include/Qt/qconfig-dist.h
===================================================================
--- trunk/include/Qt/qconfig-dist.h	(revision 769)
+++ trunk/include/Qt/qconfig-dist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qconfig-dist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qconfig-dist.h"
Index: trunk/include/Qt/qconfig-large.h
===================================================================
--- trunk/include/Qt/qconfig-large.h	(revision 769)
+++ trunk/include/Qt/qconfig-large.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qconfig-large.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qconfig-large.h"
Index: trunk/include/Qt/qconfig-medium.h
===================================================================
--- trunk/include/Qt/qconfig-medium.h	(revision 769)
+++ trunk/include/Qt/qconfig-medium.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qconfig-medium.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qconfig-medium.h"
Index: trunk/include/Qt/qconfig-minimal.h
===================================================================
--- trunk/include/Qt/qconfig-minimal.h	(revision 769)
+++ trunk/include/Qt/qconfig-minimal.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qconfig-minimal.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qconfig-minimal.h"
Index: trunk/include/Qt/qconfig-small.h
===================================================================
--- trunk/include/Qt/qconfig-small.h	(revision 769)
+++ trunk/include/Qt/qconfig-small.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qconfig-small.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qconfig-small.h"
Index: trunk/include/Qt/qcontainerfwd.h
===================================================================
--- trunk/include/Qt/qcontainerfwd.h	(revision 769)
+++ trunk/include/Qt/qcontainerfwd.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qcontainerfwd.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qcontainerfwd.h"
Index: trunk/include/Qt/qcontiguouscache.h
===================================================================
--- trunk/include/Qt/qcontiguouscache.h	(revision 769)
+++ trunk/include/Qt/qcontiguouscache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qcontiguouscache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qcontiguouscache.h"
Index: trunk/include/Qt/qcopchannel_qws.h
===================================================================
--- trunk/include/Qt/qcopchannel_qws.h	(revision 769)
+++ trunk/include/Qt/qcopchannel_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qcopchannel_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcopchannel_qws.h"
Index: trunk/include/Qt/qcoreapplication.h
===================================================================
--- trunk/include/Qt/qcoreapplication.h	(revision 769)
+++ trunk/include/Qt/qcoreapplication.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qcoreapplication.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qcoreapplication.h"
Index: trunk/include/Qt/qcoreevent.h
===================================================================
--- trunk/include/Qt/qcoreevent.h	(revision 769)
+++ trunk/include/Qt/qcoreevent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qcoreevent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qcoreevent.h"
Index: trunk/include/Qt/qcryptographichash.h
===================================================================
--- trunk/include/Qt/qcryptographichash.h	(revision 769)
+++ trunk/include/Qt/qcryptographichash.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qcryptographichash.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qcryptographichash.h"
Index: trunk/include/Qt/qcursor.h
===================================================================
--- trunk/include/Qt/qcursor.h	(revision 769)
+++ trunk/include/Qt/qcursor.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qcursor.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qcursor.h"
Index: trunk/include/Qt/qdatastream.h
===================================================================
--- trunk/include/Qt/qdatastream.h	(revision 769)
+++ trunk/include/Qt/qdatastream.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qdatastream.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qdatastream.h"
Index: trunk/include/Qt/qdatawidgetmapper.h
===================================================================
--- trunk/include/Qt/qdatawidgetmapper.h	(revision 769)
+++ trunk/include/Qt/qdatawidgetmapper.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qdatawidgetmapper.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdatawidgetmapper.h"
Index: trunk/include/Qt/qdatetime.h
===================================================================
--- trunk/include/Qt/qdatetime.h	(revision 769)
+++ trunk/include/Qt/qdatetime.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qdatetime.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qdatetime.h"
Index: trunk/include/Qt/qdatetimeedit.h
===================================================================
--- trunk/include/Qt/qdatetimeedit.h	(revision 769)
+++ trunk/include/Qt/qdatetimeedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qdatetimeedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdatetimeedit.h"
Index: trunk/include/Qt/qdbusabstractadaptor.h
===================================================================
--- trunk/include/Qt/qdbusabstractadaptor.h	(revision 769)
+++ trunk/include/Qt/qdbusabstractadaptor.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusabstractadaptor.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusabstractadaptor.h"
Index: trunk/include/Qt/qdbusabstractinterface.h
===================================================================
--- trunk/include/Qt/qdbusabstractinterface.h	(revision 769)
+++ trunk/include/Qt/qdbusabstractinterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusabstractinterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusabstractinterface.h"
Index: trunk/include/Qt/qdbusargument.h
===================================================================
--- trunk/include/Qt/qdbusargument.h	(revision 769)
+++ trunk/include/Qt/qdbusargument.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusargument.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusargument.h"
Index: trunk/include/Qt/qdbusconnection.h
===================================================================
--- trunk/include/Qt/qdbusconnection.h	(revision 769)
+++ trunk/include/Qt/qdbusconnection.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusconnection.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusconnection.h"
Index: trunk/include/Qt/qdbusconnectioninterface.h
===================================================================
--- trunk/include/Qt/qdbusconnectioninterface.h	(revision 769)
+++ trunk/include/Qt/qdbusconnectioninterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusconnectioninterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusconnectioninterface.h"
Index: trunk/include/Qt/qdbuscontext.h
===================================================================
--- trunk/include/Qt/qdbuscontext.h	(revision 769)
+++ trunk/include/Qt/qdbuscontext.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbuscontext.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbuscontext.h"
Index: trunk/include/Qt/qdbuserror.h
===================================================================
--- trunk/include/Qt/qdbuserror.h	(revision 769)
+++ trunk/include/Qt/qdbuserror.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbuserror.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbuserror.h"
Index: trunk/include/Qt/qdbusextratypes.h
===================================================================
--- trunk/include/Qt/qdbusextratypes.h	(revision 769)
+++ trunk/include/Qt/qdbusextratypes.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusextratypes.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusextratypes.h"
Index: trunk/include/Qt/qdbusinterface.h
===================================================================
--- trunk/include/Qt/qdbusinterface.h	(revision 769)
+++ trunk/include/Qt/qdbusinterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusinterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusinterface.h"
Index: trunk/include/Qt/qdbusmacros.h
===================================================================
--- trunk/include/Qt/qdbusmacros.h	(revision 769)
+++ trunk/include/Qt/qdbusmacros.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusmacros.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusmacros.h"
Index: trunk/include/Qt/qdbusmessage.h
===================================================================
--- trunk/include/Qt/qdbusmessage.h	(revision 769)
+++ trunk/include/Qt/qdbusmessage.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusmessage.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusmessage.h"
Index: trunk/include/Qt/qdbusmetatype.h
===================================================================
--- trunk/include/Qt/qdbusmetatype.h	(revision 769)
+++ trunk/include/Qt/qdbusmetatype.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusmetatype.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusmetatype.h"
Index: trunk/include/Qt/qdbuspendingcall.h
===================================================================
--- trunk/include/Qt/qdbuspendingcall.h	(revision 769)
+++ trunk/include/Qt/qdbuspendingcall.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbuspendingcall.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbuspendingcall.h"
Index: trunk/include/Qt/qdbuspendingreply.h
===================================================================
--- trunk/include/Qt/qdbuspendingreply.h	(revision 769)
+++ trunk/include/Qt/qdbuspendingreply.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbuspendingreply.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbuspendingreply.h"
Index: trunk/include/Qt/qdbusreply.h
===================================================================
--- trunk/include/Qt/qdbusreply.h	(revision 769)
+++ trunk/include/Qt/qdbusreply.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusreply.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusreply.h"
Index: trunk/include/Qt/qdbusserver.h
===================================================================
--- trunk/include/Qt/qdbusserver.h	(revision 769)
+++ trunk/include/Qt/qdbusserver.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusserver.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusserver.h"
Index: trunk/include/Qt/qdbusservicewatcher.h
===================================================================
--- trunk/include/Qt/qdbusservicewatcher.h	(revision 769)
+++ trunk/include/Qt/qdbusservicewatcher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/dbus/qdbusservicewatcher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDBus/qdbusservicewatcher.h"
Index: trunk/include/Qt/qdebug.h
===================================================================
--- trunk/include/Qt/qdebug.h	(revision 769)
+++ trunk/include/Qt/qdebug.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qdebug.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qdebug.h"
Index: trunk/include/Qt/qdeclarative.h
===================================================================
--- trunk/include/Qt/qdeclarative.h	(revision 846)
+++ trunk/include/Qt/qdeclarative.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarative.h"
Index: trunk/include/Qt/qdeclarativecomponent.h
===================================================================
--- trunk/include/Qt/qdeclarativecomponent.h	(revision 846)
+++ trunk/include/Qt/qdeclarativecomponent.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativecomponent.h"
Index: trunk/include/Qt/qdeclarativecontext.h
===================================================================
--- trunk/include/Qt/qdeclarativecontext.h	(revision 846)
+++ trunk/include/Qt/qdeclarativecontext.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativecontext.h"
Index: trunk/include/Qt/qdeclarativeengine.h
===================================================================
--- trunk/include/Qt/qdeclarativeengine.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeengine.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeengine.h"
Index: trunk/include/Qt/qdeclarativeerror.h
===================================================================
--- trunk/include/Qt/qdeclarativeerror.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeerror.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeerror.h"
Index: trunk/include/Qt/qdeclarativeexpression.h
===================================================================
--- trunk/include/Qt/qdeclarativeexpression.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeexpression.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeexpression.h"
Index: trunk/include/Qt/qdeclarativeextensioninterface.h
===================================================================
--- trunk/include/Qt/qdeclarativeextensioninterface.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeextensioninterface.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeextensioninterface.h"
Index: trunk/include/Qt/qdeclarativeextensionplugin.h
===================================================================
--- trunk/include/Qt/qdeclarativeextensionplugin.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeextensionplugin.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeextensionplugin.h"
Index: trunk/include/Qt/qdeclarativeimageprovider.h
===================================================================
--- trunk/include/Qt/qdeclarativeimageprovider.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeimageprovider.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeimageprovider.h"
Index: trunk/include/Qt/qdeclarativeinfo.h
===================================================================
--- trunk/include/Qt/qdeclarativeinfo.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeinfo.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeinfo.h"
Index: trunk/include/Qt/qdeclarativeitem.h
===================================================================
--- trunk/include/Qt/qdeclarativeitem.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeitem.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeitem.h"
Index: trunk/include/Qt/qdeclarativelist.h
===================================================================
--- trunk/include/Qt/qdeclarativelist.h	(revision 846)
+++ trunk/include/Qt/qdeclarativelist.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativelist.h"
Index: trunk/include/Qt/qdeclarativenetworkaccessmanagerfactory.h
===================================================================
--- trunk/include/Qt/qdeclarativenetworkaccessmanagerfactory.h	(revision 846)
+++ trunk/include/Qt/qdeclarativenetworkaccessmanagerfactory.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h"
Index: trunk/include/Qt/qdeclarativeparserstatus.h
===================================================================
--- trunk/include/Qt/qdeclarativeparserstatus.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeparserstatus.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeparserstatus.h"
Index: trunk/include/Qt/qdeclarativeprivate.h
===================================================================
--- trunk/include/Qt/qdeclarativeprivate.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeprivate.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeprivate.h"
Index: trunk/include/Qt/qdeclarativeproperty.h
===================================================================
--- trunk/include/Qt/qdeclarativeproperty.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeproperty.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeproperty.h"
Index: trunk/include/Qt/qdeclarativepropertymap.h
===================================================================
--- trunk/include/Qt/qdeclarativepropertymap.h	(revision 846)
+++ trunk/include/Qt/qdeclarativepropertymap.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativepropertymap.h"
Index: trunk/include/Qt/qdeclarativepropertyvalueinterceptor.h
===================================================================
--- trunk/include/Qt/qdeclarativepropertyvalueinterceptor.h	(revision 846)
+++ trunk/include/Qt/qdeclarativepropertyvalueinterceptor.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativepropertyvalueinterceptor.h"
Index: trunk/include/Qt/qdeclarativepropertyvaluesource.h
===================================================================
--- trunk/include/Qt/qdeclarativepropertyvaluesource.h	(revision 846)
+++ trunk/include/Qt/qdeclarativepropertyvaluesource.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativepropertyvaluesource.h"
Index: trunk/include/Qt/qdeclarativescriptstring.h
===================================================================
--- trunk/include/Qt/qdeclarativescriptstring.h	(revision 846)
+++ trunk/include/Qt/qdeclarativescriptstring.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativescriptstring.h"
Index: trunk/include/Qt/qdeclarativeview.h
===================================================================
--- trunk/include/Qt/qdeclarativeview.h	(revision 846)
+++ trunk/include/Qt/qdeclarativeview.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtDeclarative/qdeclarativeview.h"
Index: trunk/include/Qt/qdecoration_qws.h
===================================================================
--- trunk/include/Qt/qdecoration_qws.h	(revision 769)
+++ trunk/include/Qt/qdecoration_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdecoration_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdecoration_qws.h"
Index: trunk/include/Qt/qdecorationdefault_qws.h
===================================================================
--- trunk/include/Qt/qdecorationdefault_qws.h	(revision 769)
+++ trunk/include/Qt/qdecorationdefault_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdecorationdefault_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdecorationdefault_qws.h"
Index: trunk/include/Qt/qdecorationfactory_qws.h
===================================================================
--- trunk/include/Qt/qdecorationfactory_qws.h	(revision 769)
+++ trunk/include/Qt/qdecorationfactory_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdecorationfactory_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdecorationfactory_qws.h"
Index: trunk/include/Qt/qdecorationplugin_qws.h
===================================================================
--- trunk/include/Qt/qdecorationplugin_qws.h	(revision 769)
+++ trunk/include/Qt/qdecorationplugin_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdecorationplugin_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdecorationplugin_qws.h"
Index: trunk/include/Qt/qdecorationstyled_qws.h
===================================================================
--- trunk/include/Qt/qdecorationstyled_qws.h	(revision 769)
+++ trunk/include/Qt/qdecorationstyled_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdecorationstyled_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdecorationstyled_qws.h"
Index: trunk/include/Qt/qdecorationwindows_qws.h
===================================================================
--- trunk/include/Qt/qdecorationwindows_qws.h	(revision 769)
+++ trunk/include/Qt/qdecorationwindows_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdecorationwindows_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdecorationwindows_qws.h"
Index: trunk/include/Qt/qdesktopservices.h
===================================================================
--- trunk/include/Qt/qdesktopservices.h	(revision 769)
+++ trunk/include/Qt/qdesktopservices.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/util/qdesktopservices.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdesktopservices.h"
Index: trunk/include/Qt/qdesktopwidget.h
===================================================================
--- trunk/include/Qt/qdesktopwidget.h	(revision 769)
+++ trunk/include/Qt/qdesktopwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qdesktopwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdesktopwidget.h"
Index: trunk/include/Qt/qdial.h
===================================================================
--- trunk/include/Qt/qdial.h	(revision 769)
+++ trunk/include/Qt/qdial.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qdial.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdial.h"
Index: trunk/include/Qt/qdialog.h
===================================================================
--- trunk/include/Qt/qdialog.h	(revision 769)
+++ trunk/include/Qt/qdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdialog.h"
Index: trunk/include/Qt/qdialogbuttonbox.h
===================================================================
--- trunk/include/Qt/qdialogbuttonbox.h	(revision 769)
+++ trunk/include/Qt/qdialogbuttonbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qdialogbuttonbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdialogbuttonbox.h"
Index: trunk/include/Qt/qdir.h
===================================================================
--- trunk/include/Qt/qdir.h	(revision 769)
+++ trunk/include/Qt/qdir.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qdir.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qdir.h"
Index: trunk/include/Qt/qdirectpainter_qws.h
===================================================================
--- trunk/include/Qt/qdirectpainter_qws.h	(revision 769)
+++ trunk/include/Qt/qdirectpainter_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qdirectpainter_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdirectpainter_qws.h"
Index: trunk/include/Qt/qdiriterator.h
===================================================================
--- trunk/include/Qt/qdiriterator.h	(revision 769)
+++ trunk/include/Qt/qdiriterator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qdiriterator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qdiriterator.h"
Index: trunk/include/Qt/qdirmodel.h
===================================================================
--- trunk/include/Qt/qdirmodel.h	(revision 769)
+++ trunk/include/Qt/qdirmodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qdirmodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdirmodel.h"
Index: trunk/include/Qt/qdockwidget.h
===================================================================
--- trunk/include/Qt/qdockwidget.h	(revision 769)
+++ trunk/include/Qt/qdockwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qdockwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdockwidget.h"
Index: trunk/include/Qt/qdom.h
===================================================================
--- trunk/include/Qt/qdom.h	(revision 769)
+++ trunk/include/Qt/qdom.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xml/dom/qdom.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXml/qdom.h"
Index: trunk/include/Qt/qdrag.h
===================================================================
--- trunk/include/Qt/qdrag.h	(revision 769)
+++ trunk/include/Qt/qdrag.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qdrag.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdrag.h"
Index: trunk/include/Qt/qdrawutil.h
===================================================================
--- trunk/include/Qt/qdrawutil.h	(revision 769)
+++ trunk/include/Qt/qdrawutil.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qdrawutil.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qdrawutil.h"
Index: trunk/include/Qt/qeasingcurve.h
===================================================================
--- trunk/include/Qt/qeasingcurve.h	(revision 769)
+++ trunk/include/Qt/qeasingcurve.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qeasingcurve.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qeasingcurve.h"
Index: trunk/include/Qt/qelapsedtimer.h
===================================================================
--- trunk/include/Qt/qelapsedtimer.h	(revision 846)
+++ trunk/include/Qt/qelapsedtimer.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qelapsedtimer.h"
Index: trunk/include/Qt/qendian.h
===================================================================
--- trunk/include/Qt/qendian.h	(revision 769)
+++ trunk/include/Qt/qendian.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qendian.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qendian.h"
Index: trunk/include/Qt/qerrormessage.h
===================================================================
--- trunk/include/Qt/qerrormessage.h	(revision 769)
+++ trunk/include/Qt/qerrormessage.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qerrormessage.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qerrormessage.h"
Index: trunk/include/Qt/qevent.h
===================================================================
--- trunk/include/Qt/qevent.h	(revision 769)
+++ trunk/include/Qt/qevent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qevent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qevent.h"
Index: trunk/include/Qt/qeventloop.h
===================================================================
--- trunk/include/Qt/qeventloop.h	(revision 769)
+++ trunk/include/Qt/qeventloop.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qeventloop.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qeventloop.h"
Index: trunk/include/Qt/qeventtransition.h
===================================================================
--- trunk/include/Qt/qeventtransition.h	(revision 769)
+++ trunk/include/Qt/qeventtransition.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qeventtransition.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qeventtransition.h"
Index: trunk/include/Qt/qfactoryinterface.h
===================================================================
--- trunk/include/Qt/qfactoryinterface.h	(revision 769)
+++ trunk/include/Qt/qfactoryinterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/plugin/qfactoryinterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfactoryinterface.h"
Index: trunk/include/Qt/qfeatures.h
===================================================================
--- trunk/include/Qt/qfeatures.h	(revision 769)
+++ trunk/include/Qt/qfeatures.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qfeatures.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfeatures.h"
Index: trunk/include/Qt/qfile.h
===================================================================
--- trunk/include/Qt/qfile.h	(revision 769)
+++ trunk/include/Qt/qfile.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qfile.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfile.h"
Index: trunk/include/Qt/qfiledialog.h
===================================================================
--- trunk/include/Qt/qfiledialog.h	(revision 769)
+++ trunk/include/Qt/qfiledialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qfiledialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfiledialog.h"
Index: trunk/include/Qt/qfileiconprovider.h
===================================================================
--- trunk/include/Qt/qfileiconprovider.h	(revision 769)
+++ trunk/include/Qt/qfileiconprovider.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qfileiconprovider.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfileiconprovider.h"
Index: trunk/include/Qt/qfileinfo.h
===================================================================
--- trunk/include/Qt/qfileinfo.h	(revision 769)
+++ trunk/include/Qt/qfileinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qfileinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfileinfo.h"
Index: trunk/include/Qt/qfilesystemmodel.h
===================================================================
--- trunk/include/Qt/qfilesystemmodel.h	(revision 769)
+++ trunk/include/Qt/qfilesystemmodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qfilesystemmodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfilesystemmodel.h"
Index: trunk/include/Qt/qfilesystemwatcher.h
===================================================================
--- trunk/include/Qt/qfilesystemwatcher.h	(revision 769)
+++ trunk/include/Qt/qfilesystemwatcher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qfilesystemwatcher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfilesystemwatcher.h"
Index: trunk/include/Qt/qfinalstate.h
===================================================================
--- trunk/include/Qt/qfinalstate.h	(revision 769)
+++ trunk/include/Qt/qfinalstate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qfinalstate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfinalstate.h"
Index: trunk/include/Qt/qfocusframe.h
===================================================================
--- trunk/include/Qt/qfocusframe.h	(revision 769)
+++ trunk/include/Qt/qfocusframe.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qfocusframe.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfocusframe.h"
Index: trunk/include/Qt/qfont.h
===================================================================
--- trunk/include/Qt/qfont.h	(revision 769)
+++ trunk/include/Qt/qfont.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qfont.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfont.h"
Index: trunk/include/Qt/qfontcombobox.h
===================================================================
--- trunk/include/Qt/qfontcombobox.h	(revision 769)
+++ trunk/include/Qt/qfontcombobox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qfontcombobox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfontcombobox.h"
Index: trunk/include/Qt/qfontdatabase.h
===================================================================
--- trunk/include/Qt/qfontdatabase.h	(revision 769)
+++ trunk/include/Qt/qfontdatabase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qfontdatabase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfontdatabase.h"
Index: trunk/include/Qt/qfontdialog.h
===================================================================
--- trunk/include/Qt/qfontdialog.h	(revision 769)
+++ trunk/include/Qt/qfontdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qfontdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfontdialog.h"
Index: trunk/include/Qt/qfontinfo.h
===================================================================
--- trunk/include/Qt/qfontinfo.h	(revision 769)
+++ trunk/include/Qt/qfontinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qfontinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfontinfo.h"
Index: trunk/include/Qt/qfontmetrics.h
===================================================================
--- trunk/include/Qt/qfontmetrics.h	(revision 769)
+++ trunk/include/Qt/qfontmetrics.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qfontmetrics.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qfontmetrics.h"
Index: trunk/include/Qt/qformlayout.h
===================================================================
--- trunk/include/Qt/qformlayout.h	(revision 769)
+++ trunk/include/Qt/qformlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qformlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qformlayout.h"
Index: trunk/include/Qt/qframe.h
===================================================================
--- trunk/include/Qt/qframe.h	(revision 769)
+++ trunk/include/Qt/qframe.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qframe.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qframe.h"
Index: trunk/include/Qt/qfsfileengine.h
===================================================================
--- trunk/include/Qt/qfsfileengine.h	(revision 769)
+++ trunk/include/Qt/qfsfileengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qfsfileengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfsfileengine.h"
Index: trunk/include/Qt/qftp.h
===================================================================
--- trunk/include/Qt/qftp.h	(revision 769)
+++ trunk/include/Qt/qftp.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qftp.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qftp.h"
Index: trunk/include/Qt/qfunctions_vxworks.h
===================================================================
--- trunk/include/Qt/qfunctions_vxworks.h	(revision 769)
+++ trunk/include/Qt/qfunctions_vxworks.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qfunctions_vxworks.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfunctions_vxworks.h"
Index: trunk/include/Qt/qfunctions_wince.h
===================================================================
--- trunk/include/Qt/qfunctions_wince.h	(revision 769)
+++ trunk/include/Qt/qfunctions_wince.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qfunctions_wince.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfunctions_wince.h"
Index: trunk/include/Qt/qfuture.h
===================================================================
--- trunk/include/Qt/qfuture.h	(revision 769)
+++ trunk/include/Qt/qfuture.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qfuture.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfuture.h"
Index: trunk/include/Qt/qfutureinterface.h
===================================================================
--- trunk/include/Qt/qfutureinterface.h	(revision 769)
+++ trunk/include/Qt/qfutureinterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qfutureinterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfutureinterface.h"
Index: trunk/include/Qt/qfuturesynchronizer.h
===================================================================
--- trunk/include/Qt/qfuturesynchronizer.h	(revision 769)
+++ trunk/include/Qt/qfuturesynchronizer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qfuturesynchronizer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfuturesynchronizer.h"
Index: trunk/include/Qt/qfuturewatcher.h
===================================================================
--- trunk/include/Qt/qfuturewatcher.h	(revision 769)
+++ trunk/include/Qt/qfuturewatcher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qfuturewatcher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qfuturewatcher.h"
Index: trunk/include/Qt/qgenericmatrix.h
===================================================================
--- trunk/include/Qt/qgenericmatrix.h	(revision 769)
+++ trunk/include/Qt/qgenericmatrix.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/math3d/qgenericmatrix.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgenericmatrix.h"
Index: trunk/include/Qt/qgesture.h
===================================================================
--- trunk/include/Qt/qgesture.h	(revision 769)
+++ trunk/include/Qt/qgesture.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qgesture.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgesture.h"
Index: trunk/include/Qt/qgesturerecognizer.h
===================================================================
--- trunk/include/Qt/qgesturerecognizer.h	(revision 769)
+++ trunk/include/Qt/qgesturerecognizer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qgesturerecognizer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgesturerecognizer.h"
Index: trunk/include/Qt/qgl.h
===================================================================
--- trunk/include/Qt/qgl.h	(revision 769)
+++ trunk/include/Qt/qgl.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/opengl/qgl.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qgl.h"
Index: trunk/include/Qt/qglbuffer.h
===================================================================
--- trunk/include/Qt/qglbuffer.h	(revision 846)
+++ trunk/include/Qt/qglbuffer.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qglbuffer.h"
Index: trunk/include/Qt/qglcolormap.h
===================================================================
--- trunk/include/Qt/qglcolormap.h	(revision 769)
+++ trunk/include/Qt/qglcolormap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/opengl/qglcolormap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qglcolormap.h"
Index: trunk/include/Qt/qglframebufferobject.h
===================================================================
--- trunk/include/Qt/qglframebufferobject.h	(revision 769)
+++ trunk/include/Qt/qglframebufferobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/opengl/qglframebufferobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qglframebufferobject.h"
Index: trunk/include/Qt/qglobal.h
===================================================================
--- trunk/include/Qt/qglobal.h	(revision 769)
+++ trunk/include/Qt/qglobal.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qglobal.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qglobal.h"
Index: trunk/include/Qt/qglpixelbuffer.h
===================================================================
--- trunk/include/Qt/qglpixelbuffer.h	(revision 769)
+++ trunk/include/Qt/qglpixelbuffer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/opengl/qglpixelbuffer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qglpixelbuffer.h"
Index: trunk/include/Qt/qglscreen_qws.h
===================================================================
--- trunk/include/Qt/qglscreen_qws.h	(revision 769)
+++ trunk/include/Qt/qglscreen_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/opengl/qglscreen_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qglscreen_qws.h"
Index: trunk/include/Qt/qglshaderprogram.h
===================================================================
--- trunk/include/Qt/qglshaderprogram.h	(revision 769)
+++ trunk/include/Qt/qglshaderprogram.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/opengl/qglshaderprogram.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenGL/qglshaderprogram.h"
Index: trunk/include/Qt/qgraphicsanchorlayout.h
===================================================================
--- trunk/include/Qt/qgraphicsanchorlayout.h	(revision 769)
+++ trunk/include/Qt/qgraphicsanchorlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsanchorlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsanchorlayout.h"
Index: trunk/include/Qt/qgraphicseffect.h
===================================================================
--- trunk/include/Qt/qgraphicseffect.h	(revision 769)
+++ trunk/include/Qt/qgraphicseffect.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/effects/qgraphicseffect.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicseffect.h"
Index: trunk/include/Qt/qgraphicsgridlayout.h
===================================================================
--- trunk/include/Qt/qgraphicsgridlayout.h	(revision 769)
+++ trunk/include/Qt/qgraphicsgridlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsgridlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsgridlayout.h"
Index: trunk/include/Qt/qgraphicsitem.h
===================================================================
--- trunk/include/Qt/qgraphicsitem.h	(revision 769)
+++ trunk/include/Qt/qgraphicsitem.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsitem.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsitem.h"
Index: trunk/include/Qt/qgraphicsitemanimation.h
===================================================================
--- trunk/include/Qt/qgraphicsitemanimation.h	(revision 769)
+++ trunk/include/Qt/qgraphicsitemanimation.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsitemanimation.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsitemanimation.h"
Index: trunk/include/Qt/qgraphicslayout.h
===================================================================
--- trunk/include/Qt/qgraphicslayout.h	(revision 769)
+++ trunk/include/Qt/qgraphicslayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicslayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicslayout.h"
Index: trunk/include/Qt/qgraphicslayoutitem.h
===================================================================
--- trunk/include/Qt/qgraphicslayoutitem.h	(revision 769)
+++ trunk/include/Qt/qgraphicslayoutitem.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicslayoutitem.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicslayoutitem.h"
Index: trunk/include/Qt/qgraphicslinearlayout.h
===================================================================
--- trunk/include/Qt/qgraphicslinearlayout.h	(revision 769)
+++ trunk/include/Qt/qgraphicslinearlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicslinearlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicslinearlayout.h"
Index: trunk/include/Qt/qgraphicsproxywidget.h
===================================================================
--- trunk/include/Qt/qgraphicsproxywidget.h	(revision 769)
+++ trunk/include/Qt/qgraphicsproxywidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsproxywidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsproxywidget.h"
Index: trunk/include/Qt/qgraphicsscene.h
===================================================================
--- trunk/include/Qt/qgraphicsscene.h	(revision 769)
+++ trunk/include/Qt/qgraphicsscene.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsscene.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsscene.h"
Index: trunk/include/Qt/qgraphicssceneevent.h
===================================================================
--- trunk/include/Qt/qgraphicssceneevent.h	(revision 769)
+++ trunk/include/Qt/qgraphicssceneevent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicssceneevent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicssceneevent.h"
Index: trunk/include/Qt/qgraphicssvgitem.h
===================================================================
--- trunk/include/Qt/qgraphicssvgitem.h	(revision 769)
+++ trunk/include/Qt/qgraphicssvgitem.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/svg/qgraphicssvgitem.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSvg/qgraphicssvgitem.h"
Index: trunk/include/Qt/qgraphicstransform.h
===================================================================
--- trunk/include/Qt/qgraphicstransform.h	(revision 769)
+++ trunk/include/Qt/qgraphicstransform.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicstransform.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicstransform.h"
Index: trunk/include/Qt/qgraphicsview.h
===================================================================
--- trunk/include/Qt/qgraphicsview.h	(revision 769)
+++ trunk/include/Qt/qgraphicsview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicsview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicsview.h"
Index: trunk/include/Qt/qgraphicswebview.h
===================================================================
--- trunk/include/Qt/qgraphicswebview.h	(revision 769)
+++ trunk/include/Qt/qgraphicswebview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qgraphicswebview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qgraphicswebview.h"
Index: trunk/include/Qt/qgraphicswidget.h
===================================================================
--- trunk/include/Qt/qgraphicswidget.h	(revision 769)
+++ trunk/include/Qt/qgraphicswidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/graphicsview/qgraphicswidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgraphicswidget.h"
Index: trunk/include/Qt/qgridlayout.h
===================================================================
--- trunk/include/Qt/qgridlayout.h	(revision 769)
+++ trunk/include/Qt/qgridlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qgridlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgridlayout.h"
Index: trunk/include/Qt/qgroupbox.h
===================================================================
--- trunk/include/Qt/qgroupbox.h	(revision 769)
+++ trunk/include/Qt/qgroupbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qgroupbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgroupbox.h"
Index: trunk/include/Qt/qgtkstyle.h
===================================================================
--- trunk/include/Qt/qgtkstyle.h	(revision 769)
+++ trunk/include/Qt/qgtkstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qgtkstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qgtkstyle.h"
Index: trunk/include/Qt/qguifunctions_wince.h
===================================================================
--- trunk/include/Qt/qguifunctions_wince.h	(revision 769)
+++ trunk/include/Qt/qguifunctions_wince.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qguifunctions_wince.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qguifunctions_wince.h"
Index: trunk/include/Qt/qhash.h
===================================================================
--- trunk/include/Qt/qhash.h	(revision 769)
+++ trunk/include/Qt/qhash.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qhash.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qhash.h"
Index: trunk/include/Qt/qheaderview.h
===================================================================
--- trunk/include/Qt/qheaderview.h	(revision 769)
+++ trunk/include/Qt/qheaderview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qheaderview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qheaderview.h"
Index: trunk/include/Qt/qhistorystate.h
===================================================================
--- trunk/include/Qt/qhistorystate.h	(revision 769)
+++ trunk/include/Qt/qhistorystate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qhistorystate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qhistorystate.h"
Index: trunk/include/Qt/qhostaddress.h
===================================================================
--- trunk/include/Qt/qhostaddress.h	(revision 769)
+++ trunk/include/Qt/qhostaddress.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/kernel/qhostaddress.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qhostaddress.h"
Index: trunk/include/Qt/qhostinfo.h
===================================================================
--- trunk/include/Qt/qhostinfo.h	(revision 769)
+++ trunk/include/Qt/qhostinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/kernel/qhostinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qhostinfo.h"
Index: trunk/include/Qt/qhttp.h
===================================================================
--- trunk/include/Qt/qhttp.h	(revision 769)
+++ trunk/include/Qt/qhttp.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qhttp.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qhttp.h"
Index: trunk/include/Qt/qicon.h
===================================================================
--- trunk/include/Qt/qicon.h	(revision 769)
+++ trunk/include/Qt/qicon.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qicon.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qicon.h"
Index: trunk/include/Qt/qiconengine.h
===================================================================
--- trunk/include/Qt/qiconengine.h	(revision 769)
+++ trunk/include/Qt/qiconengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qiconengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qiconengine.h"
Index: trunk/include/Qt/qiconengineplugin.h
===================================================================
--- trunk/include/Qt/qiconengineplugin.h	(revision 769)
+++ trunk/include/Qt/qiconengineplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qiconengineplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qiconengineplugin.h"
Index: trunk/include/Qt/qiconset.h
===================================================================
--- trunk/include/Qt/qiconset.h	(revision 769)
+++ trunk/include/Qt/qiconset.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/qt3support/other/qiconset.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../Qt3Support/qiconset.h"
Index: trunk/include/Qt/qimage.h
===================================================================
--- trunk/include/Qt/qimage.h	(revision 769)
+++ trunk/include/Qt/qimage.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qimage.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qimage.h"
Index: trunk/include/Qt/qimageiohandler.h
===================================================================
--- trunk/include/Qt/qimageiohandler.h	(revision 769)
+++ trunk/include/Qt/qimageiohandler.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qimageiohandler.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qimageiohandler.h"
Index: trunk/include/Qt/qimagereader.h
===================================================================
--- trunk/include/Qt/qimagereader.h	(revision 769)
+++ trunk/include/Qt/qimagereader.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qimagereader.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qimagereader.h"
Index: trunk/include/Qt/qimagewriter.h
===================================================================
--- trunk/include/Qt/qimagewriter.h	(revision 769)
+++ trunk/include/Qt/qimagewriter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qimagewriter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qimagewriter.h"
Index: trunk/include/Qt/qinputcontext.h
===================================================================
--- trunk/include/Qt/qinputcontext.h	(revision 769)
+++ trunk/include/Qt/qinputcontext.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/inputmethod/qinputcontext.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qinputcontext.h"
Index: trunk/include/Qt/qinputcontextfactory.h
===================================================================
--- trunk/include/Qt/qinputcontextfactory.h	(revision 769)
+++ trunk/include/Qt/qinputcontextfactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/inputmethod/qinputcontextfactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qinputcontextfactory.h"
Index: trunk/include/Qt/qinputcontextplugin.h
===================================================================
--- trunk/include/Qt/qinputcontextplugin.h	(revision 769)
+++ trunk/include/Qt/qinputcontextplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/inputmethod/qinputcontextplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qinputcontextplugin.h"
Index: trunk/include/Qt/qinputdialog.h
===================================================================
--- trunk/include/Qt/qinputdialog.h	(revision 769)
+++ trunk/include/Qt/qinputdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qinputdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qinputdialog.h"
Index: trunk/include/Qt/qiodevice.h
===================================================================
--- trunk/include/Qt/qiodevice.h	(revision 769)
+++ trunk/include/Qt/qiodevice.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qiodevice.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qiodevice.h"
Index: trunk/include/Qt/qitemdelegate.h
===================================================================
--- trunk/include/Qt/qitemdelegate.h	(revision 769)
+++ trunk/include/Qt/qitemdelegate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qitemdelegate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qitemdelegate.h"
Index: trunk/include/Qt/qitemeditorfactory.h
===================================================================
--- trunk/include/Qt/qitemeditorfactory.h	(revision 769)
+++ trunk/include/Qt/qitemeditorfactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qitemeditorfactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qitemeditorfactory.h"
Index: trunk/include/Qt/qitemselectionmodel.h
===================================================================
--- trunk/include/Qt/qitemselectionmodel.h	(revision 769)
+++ trunk/include/Qt/qitemselectionmodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qitemselectionmodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qitemselectionmodel.h"
Index: trunk/include/Qt/qiterator.h
===================================================================
--- trunk/include/Qt/qiterator.h	(revision 769)
+++ trunk/include/Qt/qiterator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qiterator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qiterator.h"
Index: trunk/include/Qt/qkbd_qws.h
===================================================================
--- trunk/include/Qt/qkbd_qws.h	(revision 769)
+++ trunk/include/Qt/qkbd_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbd_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbd_qws.h"
Index: trunk/include/Qt/qkbddriverfactory_qws.h
===================================================================
--- trunk/include/Qt/qkbddriverfactory_qws.h	(revision 769)
+++ trunk/include/Qt/qkbddriverfactory_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbddriverfactory_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbddriverfactory_qws.h"
Index: trunk/include/Qt/qkbddriverplugin_qws.h
===================================================================
--- trunk/include/Qt/qkbddriverplugin_qws.h	(revision 769)
+++ trunk/include/Qt/qkbddriverplugin_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbddriverplugin_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbddriverplugin_qws.h"
Index: trunk/include/Qt/qkbdlinuxinput_qws.h
===================================================================
--- trunk/include/Qt/qkbdlinuxinput_qws.h	(revision 769)
+++ trunk/include/Qt/qkbdlinuxinput_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbdlinuxinput_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbdlinuxinput_qws.h"
Index: trunk/include/Qt/qkbdqnx_qws.h
===================================================================
--- trunk/include/Qt/qkbdqnx_qws.h	(revision 769)
+++ trunk/include/Qt/qkbdqnx_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbdqnx_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbdqnx_qws.h"
Index: trunk/include/Qt/qkbdtty_qws.h
===================================================================
--- trunk/include/Qt/qkbdtty_qws.h	(revision 769)
+++ trunk/include/Qt/qkbdtty_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbdtty_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbdtty_qws.h"
Index: trunk/include/Qt/qkbdum_qws.h
===================================================================
--- trunk/include/Qt/qkbdum_qws.h	(revision 769)
+++ trunk/include/Qt/qkbdum_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbdum_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbdum_qws.h"
Index: trunk/include/Qt/qkbdvfb_qws.h
===================================================================
--- trunk/include/Qt/qkbdvfb_qws.h	(revision 769)
+++ trunk/include/Qt/qkbdvfb_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qkbdvfb_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkbdvfb_qws.h"
Index: trunk/include/Qt/qkeyeventtransition.h
===================================================================
--- trunk/include/Qt/qkeyeventtransition.h	(revision 769)
+++ trunk/include/Qt/qkeyeventtransition.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/statemachine/qkeyeventtransition.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkeyeventtransition.h"
Index: trunk/include/Qt/qkeysequence.h
===================================================================
--- trunk/include/Qt/qkeysequence.h	(revision 769)
+++ trunk/include/Qt/qkeysequence.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qkeysequence.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qkeysequence.h"
Index: trunk/include/Qt/qlabel.h
===================================================================
--- trunk/include/Qt/qlabel.h	(revision 769)
+++ trunk/include/Qt/qlabel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qlabel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlabel.h"
Index: trunk/include/Qt/qlayout.h
===================================================================
--- trunk/include/Qt/qlayout.h	(revision 769)
+++ trunk/include/Qt/qlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlayout.h"
Index: trunk/include/Qt/qlayoutitem.h
===================================================================
--- trunk/include/Qt/qlayoutitem.h	(revision 769)
+++ trunk/include/Qt/qlayoutitem.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qlayoutitem.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlayoutitem.h"
Index: trunk/include/Qt/qlcdnumber.h
===================================================================
--- trunk/include/Qt/qlcdnumber.h	(revision 769)
+++ trunk/include/Qt/qlcdnumber.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qlcdnumber.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlcdnumber.h"
Index: trunk/include/Qt/qlibrary.h
===================================================================
--- trunk/include/Qt/qlibrary.h	(revision 769)
+++ trunk/include/Qt/qlibrary.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/plugin/qlibrary.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qlibrary.h"
Index: trunk/include/Qt/qlibraryinfo.h
===================================================================
--- trunk/include/Qt/qlibraryinfo.h	(revision 769)
+++ trunk/include/Qt/qlibraryinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qlibraryinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qlibraryinfo.h"
Index: trunk/include/Qt/qline.h
===================================================================
--- trunk/include/Qt/qline.h	(revision 769)
+++ trunk/include/Qt/qline.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qline.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qline.h"
Index: trunk/include/Qt/qlineedit.h
===================================================================
--- trunk/include/Qt/qlineedit.h	(revision 769)
+++ trunk/include/Qt/qlineedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qlineedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlineedit.h"
Index: trunk/include/Qt/qlinkedlist.h
===================================================================
--- trunk/include/Qt/qlinkedlist.h	(revision 769)
+++ trunk/include/Qt/qlinkedlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qlinkedlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qlinkedlist.h"
Index: trunk/include/Qt/qlist.h
===================================================================
--- trunk/include/Qt/qlist.h	(revision 769)
+++ trunk/include/Qt/qlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qlist.h"
Index: trunk/include/Qt/qlistview.h
===================================================================
--- trunk/include/Qt/qlistview.h	(revision 769)
+++ trunk/include/Qt/qlistview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qlistview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlistview.h"
Index: trunk/include/Qt/qlistwidget.h
===================================================================
--- trunk/include/Qt/qlistwidget.h	(revision 769)
+++ trunk/include/Qt/qlistwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qlistwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qlistwidget.h"
Index: trunk/include/Qt/qlocale.h
===================================================================
--- trunk/include/Qt/qlocale.h	(revision 769)
+++ trunk/include/Qt/qlocale.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qlocale.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qlocale.h"
Index: trunk/include/Qt/qlocalserver.h
===================================================================
--- trunk/include/Qt/qlocalserver.h	(revision 769)
+++ trunk/include/Qt/qlocalserver.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/socket/qlocalserver.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qlocalserver.h"
Index: trunk/include/Qt/qlocalsocket.h
===================================================================
--- trunk/include/Qt/qlocalsocket.h	(revision 769)
+++ trunk/include/Qt/qlocalsocket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/socket/qlocalsocket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qlocalsocket.h"
Index: trunk/include/Qt/qmaccocoaviewcontainer_mac.h
===================================================================
--- trunk/include/Qt/qmaccocoaviewcontainer_mac.h	(revision 769)
+++ trunk/include/Qt/qmaccocoaviewcontainer_mac.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmaccocoaviewcontainer_mac.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmaccocoaviewcontainer_mac.h"
Index: trunk/include/Qt/qmacdefines_mac.h
===================================================================
--- trunk/include/Qt/qmacdefines_mac.h	(revision 769)
+++ trunk/include/Qt/qmacdefines_mac.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qmacdefines_mac.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmacdefines_mac.h"
Index: trunk/include/Qt/qmacnativewidget_mac.h
===================================================================
--- trunk/include/Qt/qmacnativewidget_mac.h	(revision 769)
+++ trunk/include/Qt/qmacnativewidget_mac.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmacnativewidget_mac.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmacnativewidget_mac.h"
Index: trunk/include/Qt/qmacstyle_mac.h
===================================================================
--- trunk/include/Qt/qmacstyle_mac.h	(revision 769)
+++ trunk/include/Qt/qmacstyle_mac.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qmacstyle_mac.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmacstyle_mac.h"
Index: trunk/include/Qt/qmainwindow.h
===================================================================
--- trunk/include/Qt/qmainwindow.h	(revision 769)
+++ trunk/include/Qt/qmainwindow.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmainwindow.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmainwindow.h"
Index: trunk/include/Qt/qmap.h
===================================================================
--- trunk/include/Qt/qmap.h	(revision 769)
+++ trunk/include/Qt/qmap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qmap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmap.h"
Index: trunk/include/Qt/qmargins.h
===================================================================
--- trunk/include/Qt/qmargins.h	(revision 769)
+++ trunk/include/Qt/qmargins.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qmargins.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmargins.h"
Index: trunk/include/Qt/qmath.h
===================================================================
--- trunk/include/Qt/qmath.h	(revision 769)
+++ trunk/include/Qt/qmath.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qmath.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmath.h"
Index: trunk/include/Qt/qmatrix.h
===================================================================
--- trunk/include/Qt/qmatrix.h	(revision 769)
+++ trunk/include/Qt/qmatrix.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qmatrix.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmatrix.h"
Index: trunk/include/Qt/qmatrix4x4.h
===================================================================
--- trunk/include/Qt/qmatrix4x4.h	(revision 769)
+++ trunk/include/Qt/qmatrix4x4.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/math3d/qmatrix4x4.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmatrix4x4.h"
Index: trunk/include/Qt/qmdiarea.h
===================================================================
--- trunk/include/Qt/qmdiarea.h	(revision 769)
+++ trunk/include/Qt/qmdiarea.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmdiarea.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmdiarea.h"
Index: trunk/include/Qt/qmdisubwindow.h
===================================================================
--- trunk/include/Qt/qmdisubwindow.h	(revision 769)
+++ trunk/include/Qt/qmdisubwindow.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmdisubwindow.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmdisubwindow.h"
Index: trunk/include/Qt/qmenu.h
===================================================================
--- trunk/include/Qt/qmenu.h	(revision 769)
+++ trunk/include/Qt/qmenu.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmenu.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmenu.h"
Index: trunk/include/Qt/qmenubar.h
===================================================================
--- trunk/include/Qt/qmenubar.h	(revision 769)
+++ trunk/include/Qt/qmenubar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmenubar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmenubar.h"
Index: trunk/include/Qt/qmenudata.h
===================================================================
--- trunk/include/Qt/qmenudata.h	(revision 769)
+++ trunk/include/Qt/qmenudata.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qmenudata.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmenudata.h"
Index: trunk/include/Qt/qmessagebox.h
===================================================================
--- trunk/include/Qt/qmessagebox.h	(revision 769)
+++ trunk/include/Qt/qmessagebox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qmessagebox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmessagebox.h"
Index: trunk/include/Qt/qmetaobject.h
===================================================================
--- trunk/include/Qt/qmetaobject.h	(revision 769)
+++ trunk/include/Qt/qmetaobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qmetaobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmetaobject.h"
Index: trunk/include/Qt/qmetatype.h
===================================================================
--- trunk/include/Qt/qmetatype.h	(revision 769)
+++ trunk/include/Qt/qmetatype.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qmetatype.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmetatype.h"
Index: trunk/include/Qt/qmime.h
===================================================================
--- trunk/include/Qt/qmime.h	(revision 769)
+++ trunk/include/Qt/qmime.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qmime.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmime.h"
Index: trunk/include/Qt/qmimedata.h
===================================================================
--- trunk/include/Qt/qmimedata.h	(revision 769)
+++ trunk/include/Qt/qmimedata.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qmimedata.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmimedata.h"
Index: trunk/include/Qt/qmotifstyle.h
===================================================================
--- trunk/include/Qt/qmotifstyle.h	(revision 769)
+++ trunk/include/Qt/qmotifstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qmotifstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmotifstyle.h"
Index: trunk/include/Qt/qmouse_qws.h
===================================================================
--- trunk/include/Qt/qmouse_qws.h	(revision 769)
+++ trunk/include/Qt/qmouse_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmouse_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmouse_qws.h"
Index: trunk/include/Qt/qmousedriverfactory_qws.h
===================================================================
--- trunk/include/Qt/qmousedriverfactory_qws.h	(revision 769)
+++ trunk/include/Qt/qmousedriverfactory_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmousedriverfactory_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmousedriverfactory_qws.h"
Index: trunk/include/Qt/qmousedriverplugin_qws.h
===================================================================
--- trunk/include/Qt/qmousedriverplugin_qws.h	(revision 769)
+++ trunk/include/Qt/qmousedriverplugin_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmousedriverplugin_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmousedriverplugin_qws.h"
Index: trunk/include/Qt/qmouseeventtransition.h
===================================================================
--- trunk/include/Qt/qmouseeventtransition.h	(revision 769)
+++ trunk/include/Qt/qmouseeventtransition.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/statemachine/qmouseeventtransition.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmouseeventtransition.h"
Index: trunk/include/Qt/qmouselinuxinput_qws.h
===================================================================
--- trunk/include/Qt/qmouselinuxinput_qws.h	(revision 769)
+++ trunk/include/Qt/qmouselinuxinput_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmouselinuxinput_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmouselinuxinput_qws.h"
Index: trunk/include/Qt/qmouselinuxtp_qws.h
===================================================================
--- trunk/include/Qt/qmouselinuxtp_qws.h	(revision 769)
+++ trunk/include/Qt/qmouselinuxtp_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmouselinuxtp_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmouselinuxtp_qws.h"
Index: trunk/include/Qt/qmousepc_qws.h
===================================================================
--- trunk/include/Qt/qmousepc_qws.h	(revision 769)
+++ trunk/include/Qt/qmousepc_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmousepc_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmousepc_qws.h"
Index: trunk/include/Qt/qmouseqnx_qws.h
===================================================================
--- trunk/include/Qt/qmouseqnx_qws.h	(revision 769)
+++ trunk/include/Qt/qmouseqnx_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmouseqnx_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmouseqnx_qws.h"
Index: trunk/include/Qt/qmousetslib_qws.h
===================================================================
--- trunk/include/Qt/qmousetslib_qws.h	(revision 769)
+++ trunk/include/Qt/qmousetslib_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmousetslib_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmousetslib_qws.h"
Index: trunk/include/Qt/qmousevfb_qws.h
===================================================================
--- trunk/include/Qt/qmousevfb_qws.h	(revision 769)
+++ trunk/include/Qt/qmousevfb_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qmousevfb_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmousevfb_qws.h"
Index: trunk/include/Qt/qmovie.h
===================================================================
--- trunk/include/Qt/qmovie.h	(revision 769)
+++ trunk/include/Qt/qmovie.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qmovie.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qmovie.h"
Index: trunk/include/Qt/qmutex.h
===================================================================
--- trunk/include/Qt/qmutex.h	(revision 769)
+++ trunk/include/Qt/qmutex.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qmutex.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qmutex.h"
Index: trunk/include/Qt/qnamespace.h
===================================================================
--- trunk/include/Qt/qnamespace.h	(revision 769)
+++ trunk/include/Qt/qnamespace.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qnamespace.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qnamespace.h"
Index: trunk/include/Qt/qnetworkaccessmanager.h
===================================================================
--- trunk/include/Qt/qnetworkaccessmanager.h	(revision 769)
+++ trunk/include/Qt/qnetworkaccessmanager.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qnetworkaccessmanager.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkaccessmanager.h"
Index: trunk/include/Qt/qnetworkconfigmanager.h
===================================================================
--- trunk/include/Qt/qnetworkconfigmanager.h	(revision 846)
+++ trunk/include/Qt/qnetworkconfigmanager.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkconfigmanager.h"
Index: trunk/include/Qt/qnetworkconfiguration.h
===================================================================
--- trunk/include/Qt/qnetworkconfiguration.h	(revision 846)
+++ trunk/include/Qt/qnetworkconfiguration.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkconfiguration.h"
Index: trunk/include/Qt/qnetworkcookie.h
===================================================================
--- trunk/include/Qt/qnetworkcookie.h	(revision 769)
+++ trunk/include/Qt/qnetworkcookie.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qnetworkcookie.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkcookie.h"
Index: trunk/include/Qt/qnetworkcookiejar.h
===================================================================
--- trunk/include/Qt/qnetworkcookiejar.h	(revision 769)
+++ trunk/include/Qt/qnetworkcookiejar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qnetworkcookiejar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkcookiejar.h"
Index: trunk/include/Qt/qnetworkdiskcache.h
===================================================================
--- trunk/include/Qt/qnetworkdiskcache.h	(revision 769)
+++ trunk/include/Qt/qnetworkdiskcache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qnetworkdiskcache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkdiskcache.h"
Index: trunk/include/Qt/qnetworkinterface.h
===================================================================
--- trunk/include/Qt/qnetworkinterface.h	(revision 769)
+++ trunk/include/Qt/qnetworkinterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/kernel/qnetworkinterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkinterface.h"
Index: trunk/include/Qt/qnetworkproxy.h
===================================================================
--- trunk/include/Qt/qnetworkproxy.h	(revision 769)
+++ trunk/include/Qt/qnetworkproxy.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/kernel/qnetworkproxy.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkproxy.h"
Index: trunk/include/Qt/qnetworkreply.h
===================================================================
--- trunk/include/Qt/qnetworkreply.h	(revision 769)
+++ trunk/include/Qt/qnetworkreply.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qnetworkreply.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkreply.h"
Index: trunk/include/Qt/qnetworkrequest.h
===================================================================
--- trunk/include/Qt/qnetworkrequest.h	(revision 769)
+++ trunk/include/Qt/qnetworkrequest.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/access/qnetworkrequest.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworkrequest.h"
Index: trunk/include/Qt/qnetworksession.h
===================================================================
--- trunk/include/Qt/qnetworksession.h	(revision 846)
+++ trunk/include/Qt/qnetworksession.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qnetworksession.h"
Index: trunk/include/Qt/qnumeric.h
===================================================================
--- trunk/include/Qt/qnumeric.h	(revision 769)
+++ trunk/include/Qt/qnumeric.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qnumeric.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qnumeric.h"
Index: trunk/include/Qt/qobject.h
===================================================================
--- trunk/include/Qt/qobject.h	(revision 769)
+++ trunk/include/Qt/qobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qobject.h"
Index: trunk/include/Qt/qobjectcleanuphandler.h
===================================================================
--- trunk/include/Qt/qobjectcleanuphandler.h	(revision 769)
+++ trunk/include/Qt/qobjectcleanuphandler.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qobjectcleanuphandler.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qobjectcleanuphandler.h"
Index: trunk/include/Qt/qobjectdefs.h
===================================================================
--- trunk/include/Qt/qobjectdefs.h	(revision 769)
+++ trunk/include/Qt/qobjectdefs.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qobjectdefs.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qobjectdefs.h"
Index: trunk/include/Qt/qpagesetupdialog.h
===================================================================
--- trunk/include/Qt/qpagesetupdialog.h	(revision 769)
+++ trunk/include/Qt/qpagesetupdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qpagesetupdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpagesetupdialog.h"
Index: trunk/include/Qt/qpaintdevice.h
===================================================================
--- trunk/include/Qt/qpaintdevice.h	(revision 769)
+++ trunk/include/Qt/qpaintdevice.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qpaintdevice.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpaintdevice.h"
Index: trunk/include/Qt/qpaintengine.h
===================================================================
--- trunk/include/Qt/qpaintengine.h	(revision 769)
+++ trunk/include/Qt/qpaintengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qpaintengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpaintengine.h"
Index: trunk/include/Qt/qpainter.h
===================================================================
--- trunk/include/Qt/qpainter.h	(revision 769)
+++ trunk/include/Qt/qpainter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qpainter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpainter.h"
Index: trunk/include/Qt/qpainterpath.h
===================================================================
--- trunk/include/Qt/qpainterpath.h	(revision 769)
+++ trunk/include/Qt/qpainterpath.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qpainterpath.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpainterpath.h"
Index: trunk/include/Qt/qpair.h
===================================================================
--- trunk/include/Qt/qpair.h	(revision 769)
+++ trunk/include/Qt/qpair.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qpair.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qpair.h"
Index: trunk/include/Qt/qpalette.h
===================================================================
--- trunk/include/Qt/qpalette.h	(revision 769)
+++ trunk/include/Qt/qpalette.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qpalette.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpalette.h"
Index: trunk/include/Qt/qparallelanimationgroup.h
===================================================================
--- trunk/include/Qt/qparallelanimationgroup.h	(revision 769)
+++ trunk/include/Qt/qparallelanimationgroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qparallelanimationgroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qparallelanimationgroup.h"
Index: trunk/include/Qt/qpauseanimation.h
===================================================================
--- trunk/include/Qt/qpauseanimation.h	(revision 769)
+++ trunk/include/Qt/qpauseanimation.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qpauseanimation.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qpauseanimation.h"
Index: trunk/include/Qt/qpen.h
===================================================================
--- trunk/include/Qt/qpen.h	(revision 769)
+++ trunk/include/Qt/qpen.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qpen.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpen.h"
Index: trunk/include/Qt/qpicture.h
===================================================================
--- trunk/include/Qt/qpicture.h	(revision 769)
+++ trunk/include/Qt/qpicture.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qpicture.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpicture.h"
Index: trunk/include/Qt/qpictureformatplugin.h
===================================================================
--- trunk/include/Qt/qpictureformatplugin.h	(revision 769)
+++ trunk/include/Qt/qpictureformatplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qpictureformatplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpictureformatplugin.h"
Index: trunk/include/Qt/qpixmap.h
===================================================================
--- trunk/include/Qt/qpixmap.h	(revision 769)
+++ trunk/include/Qt/qpixmap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qpixmap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpixmap.h"
Index: trunk/include/Qt/qpixmapcache.h
===================================================================
--- trunk/include/Qt/qpixmapcache.h	(revision 769)
+++ trunk/include/Qt/qpixmapcache.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/image/qpixmapcache.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpixmapcache.h"
Index: trunk/include/Qt/qplaintextedit.h
===================================================================
--- trunk/include/Qt/qplaintextedit.h	(revision 769)
+++ trunk/include/Qt/qplaintextedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qplaintextedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qplaintextedit.h"
Index: trunk/include/Qt/qplastiquestyle.h
===================================================================
--- trunk/include/Qt/qplastiquestyle.h	(revision 769)
+++ trunk/include/Qt/qplastiquestyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qplastiquestyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qplastiquestyle.h"
Index: trunk/include/Qt/qplugin.h
===================================================================
--- trunk/include/Qt/qplugin.h	(revision 769)
+++ trunk/include/Qt/qplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/plugin/qplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qplugin.h"
Index: trunk/include/Qt/qpluginloader.h
===================================================================
--- trunk/include/Qt/qpluginloader.h	(revision 769)
+++ trunk/include/Qt/qpluginloader.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/plugin/qpluginloader.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qpluginloader.h"
Index: trunk/include/Qt/qpoint.h
===================================================================
--- trunk/include/Qt/qpoint.h	(revision 769)
+++ trunk/include/Qt/qpoint.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qpoint.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qpoint.h"
Index: trunk/include/Qt/qpointer.h
===================================================================
--- trunk/include/Qt/qpointer.h	(revision 769)
+++ trunk/include/Qt/qpointer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qpointer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qpointer.h"
Index: trunk/include/Qt/qpolygon.h
===================================================================
--- trunk/include/Qt/qpolygon.h	(revision 769)
+++ trunk/include/Qt/qpolygon.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qpolygon.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpolygon.h"
Index: trunk/include/Qt/qprintdialog.h
===================================================================
--- trunk/include/Qt/qprintdialog.h	(revision 769)
+++ trunk/include/Qt/qprintdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qprintdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprintdialog.h"
Index: trunk/include/Qt/qprintengine.h
===================================================================
--- trunk/include/Qt/qprintengine.h	(revision 769)
+++ trunk/include/Qt/qprintengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qprintengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprintengine.h"
Index: trunk/include/Qt/qprinter.h
===================================================================
--- trunk/include/Qt/qprinter.h	(revision 769)
+++ trunk/include/Qt/qprinter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qprinter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprinter.h"
Index: trunk/include/Qt/qprinterinfo.h
===================================================================
--- trunk/include/Qt/qprinterinfo.h	(revision 769)
+++ trunk/include/Qt/qprinterinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qprinterinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprinterinfo.h"
Index: trunk/include/Qt/qprintpreviewdialog.h
===================================================================
--- trunk/include/Qt/qprintpreviewdialog.h	(revision 769)
+++ trunk/include/Qt/qprintpreviewdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qprintpreviewdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprintpreviewdialog.h"
Index: trunk/include/Qt/qprintpreviewwidget.h
===================================================================
--- trunk/include/Qt/qprintpreviewwidget.h	(revision 769)
+++ trunk/include/Qt/qprintpreviewwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qprintpreviewwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprintpreviewwidget.h"
Index: trunk/include/Qt/qprocess.h
===================================================================
--- trunk/include/Qt/qprocess.h	(revision 769)
+++ trunk/include/Qt/qprocess.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qprocess.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qprocess.h"
Index: trunk/include/Qt/qprogressbar.h
===================================================================
--- trunk/include/Qt/qprogressbar.h	(revision 769)
+++ trunk/include/Qt/qprogressbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qprogressbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprogressbar.h"
Index: trunk/include/Qt/qprogressdialog.h
===================================================================
--- trunk/include/Qt/qprogressdialog.h	(revision 769)
+++ trunk/include/Qt/qprogressdialog.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qprogressdialog.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qprogressdialog.h"
Index: trunk/include/Qt/qpropertyanimation.h
===================================================================
--- trunk/include/Qt/qpropertyanimation.h	(revision 769)
+++ trunk/include/Qt/qpropertyanimation.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qpropertyanimation.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qpropertyanimation.h"
Index: trunk/include/Qt/qproxymodel.h
===================================================================
--- trunk/include/Qt/qproxymodel.h	(revision 769)
+++ trunk/include/Qt/qproxymodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qproxymodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qproxymodel.h"
Index: trunk/include/Qt/qproxystyle.h
===================================================================
--- trunk/include/Qt/qproxystyle.h	(revision 769)
+++ trunk/include/Qt/qproxystyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qproxystyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qproxystyle.h"
Index: trunk/include/Qt/qpushbutton.h
===================================================================
--- trunk/include/Qt/qpushbutton.h	(revision 769)
+++ trunk/include/Qt/qpushbutton.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qpushbutton.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qpushbutton.h"
Index: trunk/include/Qt/qquaternion.h
===================================================================
--- trunk/include/Qt/qquaternion.h	(revision 769)
+++ trunk/include/Qt/qquaternion.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/math3d/qquaternion.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qquaternion.h"
Index: trunk/include/Qt/qqueue.h
===================================================================
--- trunk/include/Qt/qqueue.h	(revision 769)
+++ trunk/include/Qt/qqueue.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qqueue.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qqueue.h"
Index: trunk/include/Qt/qradiobutton.h
===================================================================
--- trunk/include/Qt/qradiobutton.h	(revision 769)
+++ trunk/include/Qt/qradiobutton.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qradiobutton.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qradiobutton.h"
Index: trunk/include/Qt/qreadwritelock.h
===================================================================
--- trunk/include/Qt/qreadwritelock.h	(revision 769)
+++ trunk/include/Qt/qreadwritelock.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qreadwritelock.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qreadwritelock.h"
Index: trunk/include/Qt/qrect.h
===================================================================
--- trunk/include/Qt/qrect.h	(revision 769)
+++ trunk/include/Qt/qrect.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qrect.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qrect.h"
Index: trunk/include/Qt/qregexp.h
===================================================================
--- trunk/include/Qt/qregexp.h	(revision 769)
+++ trunk/include/Qt/qregexp.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qregexp.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qregexp.h"
Index: trunk/include/Qt/qregion.h
===================================================================
--- trunk/include/Qt/qregion.h	(revision 769)
+++ trunk/include/Qt/qregion.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qregion.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qregion.h"
Index: trunk/include/Qt/qresource.h
===================================================================
--- trunk/include/Qt/qresource.h	(revision 769)
+++ trunk/include/Qt/qresource.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qresource.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qresource.h"
Index: trunk/include/Qt/qrgb.h
===================================================================
--- trunk/include/Qt/qrgb.h	(revision 769)
+++ trunk/include/Qt/qrgb.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qrgb.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qrgb.h"
Index: trunk/include/Qt/qrubberband.h
===================================================================
--- trunk/include/Qt/qrubberband.h	(revision 769)
+++ trunk/include/Qt/qrubberband.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qrubberband.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qrubberband.h"
Index: trunk/include/Qt/qrunnable.h
===================================================================
--- trunk/include/Qt/qrunnable.h	(revision 769)
+++ trunk/include/Qt/qrunnable.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qrunnable.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qrunnable.h"
Index: trunk/include/Qt/qs60mainapplication.h
===================================================================
--- trunk/include/Qt/qs60mainapplication.h	(revision 769)
+++ trunk/include/Qt/qs60mainapplication.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/s60framework/qs60mainapplication.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qs60mainapplication.h"
Index: trunk/include/Qt/qs60mainappui.h
===================================================================
--- trunk/include/Qt/qs60mainappui.h	(revision 769)
+++ trunk/include/Qt/qs60mainappui.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/s60framework/qs60mainappui.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qs60mainappui.h"
Index: trunk/include/Qt/qs60maindocument.h
===================================================================
--- trunk/include/Qt/qs60maindocument.h	(revision 769)
+++ trunk/include/Qt/qs60maindocument.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/s60framework/qs60maindocument.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qs60maindocument.h"
Index: trunk/include/Qt/qs60style.h
===================================================================
--- trunk/include/Qt/qs60style.h	(revision 769)
+++ trunk/include/Qt/qs60style.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qs60style.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qs60style.h"
Index: trunk/include/Qt/qscopedpointer.h
===================================================================
--- trunk/include/Qt/qscopedpointer.h	(revision 769)
+++ trunk/include/Qt/qscopedpointer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qscopedpointer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qscopedpointer.h"
Index: trunk/include/Qt/qscreen_qws.h
===================================================================
--- trunk/include/Qt/qscreen_qws.h	(revision 769)
+++ trunk/include/Qt/qscreen_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreen_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreen_qws.h"
Index: trunk/include/Qt/qscreendriverfactory_qws.h
===================================================================
--- trunk/include/Qt/qscreendriverfactory_qws.h	(revision 769)
+++ trunk/include/Qt/qscreendriverfactory_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreendriverfactory_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreendriverfactory_qws.h"
Index: trunk/include/Qt/qscreendriverplugin_qws.h
===================================================================
--- trunk/include/Qt/qscreendriverplugin_qws.h	(revision 769)
+++ trunk/include/Qt/qscreendriverplugin_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreendriverplugin_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreendriverplugin_qws.h"
Index: trunk/include/Qt/qscreenlinuxfb_qws.h
===================================================================
--- trunk/include/Qt/qscreenlinuxfb_qws.h	(revision 769)
+++ trunk/include/Qt/qscreenlinuxfb_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreenlinuxfb_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreenlinuxfb_qws.h"
Index: trunk/include/Qt/qscreenproxy_qws.h
===================================================================
--- trunk/include/Qt/qscreenproxy_qws.h	(revision 769)
+++ trunk/include/Qt/qscreenproxy_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreenproxy_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreenproxy_qws.h"
Index: trunk/include/Qt/qscreenqnx_qws.h
===================================================================
--- trunk/include/Qt/qscreenqnx_qws.h	(revision 769)
+++ trunk/include/Qt/qscreenqnx_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreenqnx_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreenqnx_qws.h"
Index: trunk/include/Qt/qscreentransformed_qws.h
===================================================================
--- trunk/include/Qt/qscreentransformed_qws.h	(revision 769)
+++ trunk/include/Qt/qscreentransformed_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreentransformed_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreentransformed_qws.h"
Index: trunk/include/Qt/qscreenvfb_qws.h
===================================================================
--- trunk/include/Qt/qscreenvfb_qws.h	(revision 769)
+++ trunk/include/Qt/qscreenvfb_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qscreenvfb_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscreenvfb_qws.h"
Index: trunk/include/Qt/qscriptable.h
===================================================================
--- trunk/include/Qt/qscriptable.h	(revision 769)
+++ trunk/include/Qt/qscriptable.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptable.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptable.h"
Index: trunk/include/Qt/qscriptclass.h
===================================================================
--- trunk/include/Qt/qscriptclass.h	(revision 769)
+++ trunk/include/Qt/qscriptclass.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptclass.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptclass.h"
Index: trunk/include/Qt/qscriptclasspropertyiterator.h
===================================================================
--- trunk/include/Qt/qscriptclasspropertyiterator.h	(revision 769)
+++ trunk/include/Qt/qscriptclasspropertyiterator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptclasspropertyiterator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptclasspropertyiterator.h"
Index: trunk/include/Qt/qscriptcontext.h
===================================================================
--- trunk/include/Qt/qscriptcontext.h	(revision 769)
+++ trunk/include/Qt/qscriptcontext.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptcontext.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptcontext.h"
Index: trunk/include/Qt/qscriptcontextinfo.h
===================================================================
--- trunk/include/Qt/qscriptcontextinfo.h	(revision 769)
+++ trunk/include/Qt/qscriptcontextinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptcontextinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptcontextinfo.h"
Index: trunk/include/Qt/qscriptengine.h
===================================================================
--- trunk/include/Qt/qscriptengine.h	(revision 769)
+++ trunk/include/Qt/qscriptengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptengine.h"
Index: trunk/include/Qt/qscriptengineagent.h
===================================================================
--- trunk/include/Qt/qscriptengineagent.h	(revision 769)
+++ trunk/include/Qt/qscriptengineagent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptengineagent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptengineagent.h"
Index: trunk/include/Qt/qscriptenginedebugger.h
===================================================================
--- trunk/include/Qt/qscriptenginedebugger.h	(revision 769)
+++ trunk/include/Qt/qscriptenginedebugger.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/scripttools/debugging/qscriptenginedebugger.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScriptTools/qscriptenginedebugger.h"
Index: trunk/include/Qt/qscriptextensioninterface.h
===================================================================
--- trunk/include/Qt/qscriptextensioninterface.h	(revision 769)
+++ trunk/include/Qt/qscriptextensioninterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptextensioninterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptextensioninterface.h"
Index: trunk/include/Qt/qscriptextensionplugin.h
===================================================================
--- trunk/include/Qt/qscriptextensionplugin.h	(revision 769)
+++ trunk/include/Qt/qscriptextensionplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptextensionplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptextensionplugin.h"
Index: trunk/include/Qt/qscriptprogram.h
===================================================================
--- trunk/include/Qt/qscriptprogram.h	(revision 769)
+++ trunk/include/Qt/qscriptprogram.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptprogram.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptprogram.h"
Index: trunk/include/Qt/qscriptstring.h
===================================================================
--- trunk/include/Qt/qscriptstring.h	(revision 769)
+++ trunk/include/Qt/qscriptstring.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptstring.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptstring.h"
Index: trunk/include/Qt/qscriptvalue.h
===================================================================
--- trunk/include/Qt/qscriptvalue.h	(revision 769)
+++ trunk/include/Qt/qscriptvalue.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptvalue.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptvalue.h"
Index: trunk/include/Qt/qscriptvalueiterator.h
===================================================================
--- trunk/include/Qt/qscriptvalueiterator.h	(revision 769)
+++ trunk/include/Qt/qscriptvalueiterator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/script/api/qscriptvalueiterator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtScript/qscriptvalueiterator.h"
Index: trunk/include/Qt/qscrollarea.h
===================================================================
--- trunk/include/Qt/qscrollarea.h	(revision 769)
+++ trunk/include/Qt/qscrollarea.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qscrollarea.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscrollarea.h"
Index: trunk/include/Qt/qscrollbar.h
===================================================================
--- trunk/include/Qt/qscrollbar.h	(revision 769)
+++ trunk/include/Qt/qscrollbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qscrollbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qscrollbar.h"
Index: trunk/include/Qt/qsemaphore.h
===================================================================
--- trunk/include/Qt/qsemaphore.h	(revision 769)
+++ trunk/include/Qt/qsemaphore.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qsemaphore.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsemaphore.h"
Index: trunk/include/Qt/qsequentialanimationgroup.h
===================================================================
--- trunk/include/Qt/qsequentialanimationgroup.h	(revision 769)
+++ trunk/include/Qt/qsequentialanimationgroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qsequentialanimationgroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsequentialanimationgroup.h"
Index: trunk/include/Qt/qsessionmanager.h
===================================================================
--- trunk/include/Qt/qsessionmanager.h	(revision 769)
+++ trunk/include/Qt/qsessionmanager.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qsessionmanager.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsessionmanager.h"
Index: trunk/include/Qt/qset.h
===================================================================
--- trunk/include/Qt/qset.h	(revision 769)
+++ trunk/include/Qt/qset.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qset.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qset.h"
Index: trunk/include/Qt/qsettings.h
===================================================================
--- trunk/include/Qt/qsettings.h	(revision 769)
+++ trunk/include/Qt/qsettings.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qsettings.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsettings.h"
Index: trunk/include/Qt/qshareddata.h
===================================================================
--- trunk/include/Qt/qshareddata.h	(revision 769)
+++ trunk/include/Qt/qshareddata.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qshareddata.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qshareddata.h"
Index: trunk/include/Qt/qsharedmemory.h
===================================================================
--- trunk/include/Qt/qsharedmemory.h	(revision 769)
+++ trunk/include/Qt/qsharedmemory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qsharedmemory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsharedmemory.h"
Index: trunk/include/Qt/qsharedpointer.h
===================================================================
--- trunk/include/Qt/qsharedpointer.h	(revision 769)
+++ trunk/include/Qt/qsharedpointer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qsharedpointer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsharedpointer.h"
Index: trunk/include/Qt/qsharedpointer_impl.h
===================================================================
--- trunk/include/Qt/qsharedpointer_impl.h	(revision 769)
+++ trunk/include/Qt/qsharedpointer_impl.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qsharedpointer_impl.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsharedpointer_impl.h"
Index: trunk/include/Qt/qshortcut.h
===================================================================
--- trunk/include/Qt/qshortcut.h	(revision 769)
+++ trunk/include/Qt/qshortcut.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qshortcut.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qshortcut.h"
Index: trunk/include/Qt/qsignalmapper.h
===================================================================
--- trunk/include/Qt/qsignalmapper.h	(revision 769)
+++ trunk/include/Qt/qsignalmapper.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qsignalmapper.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsignalmapper.h"
Index: trunk/include/Qt/qsignalspy.h
===================================================================
--- trunk/include/Qt/qsignalspy.h	(revision 769)
+++ trunk/include/Qt/qsignalspy.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qsignalspy.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qsignalspy.h"
Index: trunk/include/Qt/qsignaltransition.h
===================================================================
--- trunk/include/Qt/qsignaltransition.h	(revision 769)
+++ trunk/include/Qt/qsignaltransition.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qsignaltransition.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsignaltransition.h"
Index: trunk/include/Qt/qsimplexmlnodemodel.h
===================================================================
--- trunk/include/Qt/qsimplexmlnodemodel.h	(revision 769)
+++ trunk/include/Qt/qsimplexmlnodemodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qsimplexmlnodemodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qsimplexmlnodemodel.h"
Index: trunk/include/Qt/qsize.h
===================================================================
--- trunk/include/Qt/qsize.h	(revision 769)
+++ trunk/include/Qt/qsize.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qsize.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsize.h"
Index: trunk/include/Qt/qsizegrip.h
===================================================================
--- trunk/include/Qt/qsizegrip.h	(revision 769)
+++ trunk/include/Qt/qsizegrip.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qsizegrip.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsizegrip.h"
Index: trunk/include/Qt/qsizepolicy.h
===================================================================
--- trunk/include/Qt/qsizepolicy.h	(revision 769)
+++ trunk/include/Qt/qsizepolicy.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qsizepolicy.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsizepolicy.h"
Index: trunk/include/Qt/qslider.h
===================================================================
--- trunk/include/Qt/qslider.h	(revision 769)
+++ trunk/include/Qt/qslider.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qslider.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qslider.h"
Index: trunk/include/Qt/qsocketnotifier.h
===================================================================
--- trunk/include/Qt/qsocketnotifier.h	(revision 769)
+++ trunk/include/Qt/qsocketnotifier.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qsocketnotifier.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsocketnotifier.h"
Index: trunk/include/Qt/qsortfilterproxymodel.h
===================================================================
--- trunk/include/Qt/qsortfilterproxymodel.h	(revision 769)
+++ trunk/include/Qt/qsortfilterproxymodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qsortfilterproxymodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsortfilterproxymodel.h"
Index: trunk/include/Qt/qsound.h
===================================================================
--- trunk/include/Qt/qsound.h	(revision 769)
+++ trunk/include/Qt/qsound.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qsound.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsound.h"
Index: trunk/include/Qt/qsoundqss_qws.h
===================================================================
--- trunk/include/Qt/qsoundqss_qws.h	(revision 769)
+++ trunk/include/Qt/qsoundqss_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qsoundqss_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsoundqss_qws.h"
Index: trunk/include/Qt/qsourcelocation.h
===================================================================
--- trunk/include/Qt/qsourcelocation.h	(revision 769)
+++ trunk/include/Qt/qsourcelocation.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qsourcelocation.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qsourcelocation.h"
Index: trunk/include/Qt/qspinbox.h
===================================================================
--- trunk/include/Qt/qspinbox.h	(revision 769)
+++ trunk/include/Qt/qspinbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qspinbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qspinbox.h"
Index: trunk/include/Qt/qsplashscreen.h
===================================================================
--- trunk/include/Qt/qsplashscreen.h	(revision 769)
+++ trunk/include/Qt/qsplashscreen.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qsplashscreen.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsplashscreen.h"
Index: trunk/include/Qt/qsplitter.h
===================================================================
--- trunk/include/Qt/qsplitter.h	(revision 769)
+++ trunk/include/Qt/qsplitter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qsplitter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsplitter.h"
Index: trunk/include/Qt/qsql.h
===================================================================
--- trunk/include/Qt/qsql.h	(revision 769)
+++ trunk/include/Qt/qsql.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsql.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql.h"
Index: trunk/include/Qt/qsql_db2.h
===================================================================
--- trunk/include/Qt/qsql_db2.h	(revision 769)
+++ trunk/include/Qt/qsql_db2.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/db2/qsql_db2.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_db2.h"
Index: trunk/include/Qt/qsql_ibase.h
===================================================================
--- trunk/include/Qt/qsql_ibase.h	(revision 769)
+++ trunk/include/Qt/qsql_ibase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/ibase/qsql_ibase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_ibase.h"
Index: trunk/include/Qt/qsql_mysql.h
===================================================================
--- trunk/include/Qt/qsql_mysql.h	(revision 769)
+++ trunk/include/Qt/qsql_mysql.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/mysql/qsql_mysql.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_mysql.h"
Index: trunk/include/Qt/qsql_oci.h
===================================================================
--- trunk/include/Qt/qsql_oci.h	(revision 769)
+++ trunk/include/Qt/qsql_oci.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/oci/qsql_oci.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_oci.h"
Index: trunk/include/Qt/qsql_odbc.h
===================================================================
--- trunk/include/Qt/qsql_odbc.h	(revision 769)
+++ trunk/include/Qt/qsql_odbc.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/odbc/qsql_odbc.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_odbc.h"
Index: trunk/include/Qt/qsql_psql.h
===================================================================
--- trunk/include/Qt/qsql_psql.h	(revision 769)
+++ trunk/include/Qt/qsql_psql.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/psql/qsql_psql.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_psql.h"
Index: trunk/include/Qt/qsql_sqlite.h
===================================================================
--- trunk/include/Qt/qsql_sqlite.h	(revision 769)
+++ trunk/include/Qt/qsql_sqlite.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/sqlite/qsql_sqlite.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_sqlite.h"
Index: trunk/include/Qt/qsql_sqlite2.h
===================================================================
--- trunk/include/Qt/qsql_sqlite2.h	(revision 769)
+++ trunk/include/Qt/qsql_sqlite2.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/sqlite2/qsql_sqlite2.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_sqlite2.h"
Index: trunk/include/Qt/qsql_tds.h
===================================================================
--- trunk/include/Qt/qsql_tds.h	(revision 769)
+++ trunk/include/Qt/qsql_tds.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/drivers/tds/qsql_tds.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsql_tds.h"
Index: trunk/include/Qt/qsqldatabase.h
===================================================================
--- trunk/include/Qt/qsqldatabase.h	(revision 769)
+++ trunk/include/Qt/qsqldatabase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqldatabase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqldatabase.h"
Index: trunk/include/Qt/qsqldriver.h
===================================================================
--- trunk/include/Qt/qsqldriver.h	(revision 769)
+++ trunk/include/Qt/qsqldriver.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqldriver.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqldriver.h"
Index: trunk/include/Qt/qsqldriverplugin.h
===================================================================
--- trunk/include/Qt/qsqldriverplugin.h	(revision 769)
+++ trunk/include/Qt/qsqldriverplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqldriverplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqldriverplugin.h"
Index: trunk/include/Qt/qsqlerror.h
===================================================================
--- trunk/include/Qt/qsqlerror.h	(revision 769)
+++ trunk/include/Qt/qsqlerror.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqlerror.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlerror.h"
Index: trunk/include/Qt/qsqlfield.h
===================================================================
--- trunk/include/Qt/qsqlfield.h	(revision 769)
+++ trunk/include/Qt/qsqlfield.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqlfield.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlfield.h"
Index: trunk/include/Qt/qsqlindex.h
===================================================================
--- trunk/include/Qt/qsqlindex.h	(revision 769)
+++ trunk/include/Qt/qsqlindex.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqlindex.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlindex.h"
Index: trunk/include/Qt/qsqlquery.h
===================================================================
--- trunk/include/Qt/qsqlquery.h	(revision 769)
+++ trunk/include/Qt/qsqlquery.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqlquery.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlquery.h"
Index: trunk/include/Qt/qsqlquerymodel.h
===================================================================
--- trunk/include/Qt/qsqlquerymodel.h	(revision 769)
+++ trunk/include/Qt/qsqlquerymodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/models/qsqlquerymodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlquerymodel.h"
Index: trunk/include/Qt/qsqlrecord.h
===================================================================
--- trunk/include/Qt/qsqlrecord.h	(revision 769)
+++ trunk/include/Qt/qsqlrecord.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqlrecord.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlrecord.h"
Index: trunk/include/Qt/qsqlrelationaldelegate.h
===================================================================
--- trunk/include/Qt/qsqlrelationaldelegate.h	(revision 769)
+++ trunk/include/Qt/qsqlrelationaldelegate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/models/qsqlrelationaldelegate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlrelationaldelegate.h"
Index: trunk/include/Qt/qsqlrelationaltablemodel.h
===================================================================
--- trunk/include/Qt/qsqlrelationaltablemodel.h	(revision 769)
+++ trunk/include/Qt/qsqlrelationaltablemodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/models/qsqlrelationaltablemodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlrelationaltablemodel.h"
Index: trunk/include/Qt/qsqlresult.h
===================================================================
--- trunk/include/Qt/qsqlresult.h	(revision 769)
+++ trunk/include/Qt/qsqlresult.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/kernel/qsqlresult.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqlresult.h"
Index: trunk/include/Qt/qsqltablemodel.h
===================================================================
--- trunk/include/Qt/qsqltablemodel.h	(revision 769)
+++ trunk/include/Qt/qsqltablemodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/sql/models/qsqltablemodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSql/qsqltablemodel.h"
Index: trunk/include/Qt/qssl.h
===================================================================
--- trunk/include/Qt/qssl.h	(revision 769)
+++ trunk/include/Qt/qssl.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qssl.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qssl.h"
Index: trunk/include/Qt/qsslcertificate.h
===================================================================
--- trunk/include/Qt/qsslcertificate.h	(revision 769)
+++ trunk/include/Qt/qsslcertificate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qsslcertificate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qsslcertificate.h"
Index: trunk/include/Qt/qsslcipher.h
===================================================================
--- trunk/include/Qt/qsslcipher.h	(revision 769)
+++ trunk/include/Qt/qsslcipher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qsslcipher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qsslcipher.h"
Index: trunk/include/Qt/qsslconfiguration.h
===================================================================
--- trunk/include/Qt/qsslconfiguration.h	(revision 769)
+++ trunk/include/Qt/qsslconfiguration.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qsslconfiguration.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qsslconfiguration.h"
Index: trunk/include/Qt/qsslerror.h
===================================================================
--- trunk/include/Qt/qsslerror.h	(revision 769)
+++ trunk/include/Qt/qsslerror.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qsslerror.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qsslerror.h"
Index: trunk/include/Qt/qsslkey.h
===================================================================
--- trunk/include/Qt/qsslkey.h	(revision 769)
+++ trunk/include/Qt/qsslkey.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qsslkey.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qsslkey.h"
Index: trunk/include/Qt/qsslsocket.h
===================================================================
--- trunk/include/Qt/qsslsocket.h	(revision 769)
+++ trunk/include/Qt/qsslsocket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/ssl/qsslsocket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qsslsocket.h"
Index: trunk/include/Qt/qstack.h
===================================================================
--- trunk/include/Qt/qstack.h	(revision 769)
+++ trunk/include/Qt/qstack.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qstack.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstack.h"
Index: trunk/include/Qt/qstackedlayout.h
===================================================================
--- trunk/include/Qt/qstackedlayout.h	(revision 769)
+++ trunk/include/Qt/qstackedlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qstackedlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstackedlayout.h"
Index: trunk/include/Qt/qstackedwidget.h
===================================================================
--- trunk/include/Qt/qstackedwidget.h	(revision 769)
+++ trunk/include/Qt/qstackedwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qstackedwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstackedwidget.h"
Index: trunk/include/Qt/qstandarditemmodel.h
===================================================================
--- trunk/include/Qt/qstandarditemmodel.h	(revision 769)
+++ trunk/include/Qt/qstandarditemmodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qstandarditemmodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstandarditemmodel.h"
Index: trunk/include/Qt/qstate.h
===================================================================
--- trunk/include/Qt/qstate.h	(revision 769)
+++ trunk/include/Qt/qstate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qstate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstate.h"
Index: trunk/include/Qt/qstatemachine.h
===================================================================
--- trunk/include/Qt/qstatemachine.h	(revision 769)
+++ trunk/include/Qt/qstatemachine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/statemachine/qstatemachine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstatemachine.h"
Index: trunk/include/Qt/qstatictext.h
===================================================================
--- trunk/include/Qt/qstatictext.h	(revision 846)
+++ trunk/include/Qt/qstatictext.h	(revision 846)
@@ -0,0 +1,9 @@
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstatictext.h"
Index: trunk/include/Qt/qstatusbar.h
===================================================================
--- trunk/include/Qt/qstatusbar.h	(revision 769)
+++ trunk/include/Qt/qstatusbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qstatusbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstatusbar.h"
Index: trunk/include/Qt/qstring.h
===================================================================
--- trunk/include/Qt/qstring.h	(revision 769)
+++ trunk/include/Qt/qstring.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qstring.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstring.h"
Index: trunk/include/Qt/qstringbuilder.h
===================================================================
--- trunk/include/Qt/qstringbuilder.h	(revision 769)
+++ trunk/include/Qt/qstringbuilder.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qstringbuilder.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstringbuilder.h"
Index: trunk/include/Qt/qstringlist.h
===================================================================
--- trunk/include/Qt/qstringlist.h	(revision 769)
+++ trunk/include/Qt/qstringlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qstringlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstringlist.h"
Index: trunk/include/Qt/qstringlistmodel.h
===================================================================
--- trunk/include/Qt/qstringlistmodel.h	(revision 769)
+++ trunk/include/Qt/qstringlistmodel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qstringlistmodel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstringlistmodel.h"
Index: trunk/include/Qt/qstringmatcher.h
===================================================================
--- trunk/include/Qt/qstringmatcher.h	(revision 769)
+++ trunk/include/Qt/qstringmatcher.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qstringmatcher.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qstringmatcher.h"
Index: trunk/include/Qt/qstyle.h
===================================================================
--- trunk/include/Qt/qstyle.h	(revision 769)
+++ trunk/include/Qt/qstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstyle.h"
Index: trunk/include/Qt/qstyleditemdelegate.h
===================================================================
--- trunk/include/Qt/qstyleditemdelegate.h	(revision 769)
+++ trunk/include/Qt/qstyleditemdelegate.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qstyleditemdelegate.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstyleditemdelegate.h"
Index: trunk/include/Qt/qstylefactory.h
===================================================================
--- trunk/include/Qt/qstylefactory.h	(revision 769)
+++ trunk/include/Qt/qstylefactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qstylefactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstylefactory.h"
Index: trunk/include/Qt/qstyleoption.h
===================================================================
--- trunk/include/Qt/qstyleoption.h	(revision 769)
+++ trunk/include/Qt/qstyleoption.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qstyleoption.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstyleoption.h"
Index: trunk/include/Qt/qstylepainter.h
===================================================================
--- trunk/include/Qt/qstylepainter.h	(revision 769)
+++ trunk/include/Qt/qstylepainter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qstylepainter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstylepainter.h"
Index: trunk/include/Qt/qstyleplugin.h
===================================================================
--- trunk/include/Qt/qstyleplugin.h	(revision 769)
+++ trunk/include/Qt/qstyleplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qstyleplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qstyleplugin.h"
Index: trunk/include/Qt/qsvggenerator.h
===================================================================
--- trunk/include/Qt/qsvggenerator.h	(revision 769)
+++ trunk/include/Qt/qsvggenerator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/svg/qsvggenerator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSvg/qsvggenerator.h"
Index: trunk/include/Qt/qsvgrenderer.h
===================================================================
--- trunk/include/Qt/qsvgrenderer.h	(revision 769)
+++ trunk/include/Qt/qsvgrenderer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/svg/qsvgrenderer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSvg/qsvgrenderer.h"
Index: trunk/include/Qt/qsvgwidget.h
===================================================================
--- trunk/include/Qt/qsvgwidget.h	(revision 769)
+++ trunk/include/Qt/qsvgwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/svg/qsvgwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtSvg/qsvgwidget.h"
Index: trunk/include/Qt/qsymbianevent.h
===================================================================
--- trunk/include/Qt/qsymbianevent.h	(revision 769)
+++ trunk/include/Qt/qsymbianevent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/symbian/qsymbianevent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsymbianevent.h"
Index: trunk/include/Qt/qsyntaxhighlighter.h
===================================================================
--- trunk/include/Qt/qsyntaxhighlighter.h	(revision 769)
+++ trunk/include/Qt/qsyntaxhighlighter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qsyntaxhighlighter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsyntaxhighlighter.h"
Index: trunk/include/Qt/qsystemsemaphore.h
===================================================================
--- trunk/include/Qt/qsystemsemaphore.h	(revision 769)
+++ trunk/include/Qt/qsystemsemaphore.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qsystemsemaphore.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qsystemsemaphore.h"
Index: trunk/include/Qt/qsystemtrayicon.h
===================================================================
--- trunk/include/Qt/qsystemtrayicon.h	(revision 769)
+++ trunk/include/Qt/qsystemtrayicon.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/util/qsystemtrayicon.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qsystemtrayicon.h"
Index: trunk/include/Qt/qt_windows.h
===================================================================
--- trunk/include/Qt/qt_windows.h	(revision 769)
+++ trunk/include/Qt/qt_windows.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/global/qt_windows.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qt_windows.h"
Index: trunk/include/Qt/qtabbar.h
===================================================================
--- trunk/include/Qt/qtabbar.h	(revision 769)
+++ trunk/include/Qt/qtabbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtabbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtabbar.h"
Index: trunk/include/Qt/qtableview.h
===================================================================
--- trunk/include/Qt/qtableview.h	(revision 769)
+++ trunk/include/Qt/qtableview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qtableview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtableview.h"
Index: trunk/include/Qt/qtablewidget.h
===================================================================
--- trunk/include/Qt/qtablewidget.h	(revision 769)
+++ trunk/include/Qt/qtablewidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qtablewidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtablewidget.h"
Index: trunk/include/Qt/qtabwidget.h
===================================================================
--- trunk/include/Qt/qtabwidget.h	(revision 769)
+++ trunk/include/Qt/qtabwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtabwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtabwidget.h"
Index: trunk/include/Qt/qtconcurrentcompilertest.h
===================================================================
--- trunk/include/Qt/qtconcurrentcompilertest.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentcompilertest.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentcompilertest.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentcompilertest.h"
Index: trunk/include/Qt/qtconcurrentexception.h
===================================================================
--- trunk/include/Qt/qtconcurrentexception.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentexception.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentexception.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentexception.h"
Index: trunk/include/Qt/qtconcurrentfilter.h
===================================================================
--- trunk/include/Qt/qtconcurrentfilter.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentfilter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentfilter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentfilter.h"
Index: trunk/include/Qt/qtconcurrentfilterkernel.h
===================================================================
--- trunk/include/Qt/qtconcurrentfilterkernel.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentfilterkernel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentfilterkernel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentfilterkernel.h"
Index: trunk/include/Qt/qtconcurrentfunctionwrappers.h
===================================================================
--- trunk/include/Qt/qtconcurrentfunctionwrappers.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentfunctionwrappers.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentfunctionwrappers.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentfunctionwrappers.h"
Index: trunk/include/Qt/qtconcurrentiteratekernel.h
===================================================================
--- trunk/include/Qt/qtconcurrentiteratekernel.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentiteratekernel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentiteratekernel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentiteratekernel.h"
Index: trunk/include/Qt/qtconcurrentmap.h
===================================================================
--- trunk/include/Qt/qtconcurrentmap.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentmap.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentmap.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentmap.h"
Index: trunk/include/Qt/qtconcurrentmapkernel.h
===================================================================
--- trunk/include/Qt/qtconcurrentmapkernel.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentmapkernel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentmapkernel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentmapkernel.h"
Index: trunk/include/Qt/qtconcurrentmedian.h
===================================================================
--- trunk/include/Qt/qtconcurrentmedian.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentmedian.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentmedian.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentmedian.h"
Index: trunk/include/Qt/qtconcurrentreducekernel.h
===================================================================
--- trunk/include/Qt/qtconcurrentreducekernel.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentreducekernel.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentreducekernel.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentreducekernel.h"
Index: trunk/include/Qt/qtconcurrentresultstore.h
===================================================================
--- trunk/include/Qt/qtconcurrentresultstore.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentresultstore.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentresultstore.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentresultstore.h"
Index: trunk/include/Qt/qtconcurrentrun.h
===================================================================
--- trunk/include/Qt/qtconcurrentrun.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentrun.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentrun.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentrun.h"
Index: trunk/include/Qt/qtconcurrentrunbase.h
===================================================================
--- trunk/include/Qt/qtconcurrentrunbase.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentrunbase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentrunbase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentrunbase.h"
Index: trunk/include/Qt/qtconcurrentstoredfunctioncall.h
===================================================================
--- trunk/include/Qt/qtconcurrentstoredfunctioncall.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentstoredfunctioncall.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentstoredfunctioncall.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentstoredfunctioncall.h"
Index: trunk/include/Qt/qtconcurrentthreadengine.h
===================================================================
--- trunk/include/Qt/qtconcurrentthreadengine.h	(revision 769)
+++ trunk/include/Qt/qtconcurrentthreadengine.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qtconcurrentthreadengine.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtconcurrentthreadengine.h"
Index: trunk/include/Qt/qtcpserver.h
===================================================================
--- trunk/include/Qt/qtcpserver.h	(revision 769)
+++ trunk/include/Qt/qtcpserver.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/socket/qtcpserver.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qtcpserver.h"
Index: trunk/include/Qt/qtcpsocket.h
===================================================================
--- trunk/include/Qt/qtcpsocket.h	(revision 769)
+++ trunk/include/Qt/qtcpsocket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/socket/qtcpsocket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qtcpsocket.h"
Index: trunk/include/Qt/qtemporaryfile.h
===================================================================
--- trunk/include/Qt/qtemporaryfile.h	(revision 769)
+++ trunk/include/Qt/qtemporaryfile.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qtemporaryfile.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtemporaryfile.h"
Index: trunk/include/Qt/qtest.h
===================================================================
--- trunk/include/Qt/qtest.h	(revision 769)
+++ trunk/include/Qt/qtest.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtest.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtest.h"
Index: trunk/include/Qt/qtest_global.h
===================================================================
--- trunk/include/Qt/qtest_global.h	(revision 769)
+++ trunk/include/Qt/qtest_global.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtest_global.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtest_global.h"
Index: trunk/include/Qt/qtest_gui.h
===================================================================
--- trunk/include/Qt/qtest_gui.h	(revision 769)
+++ trunk/include/Qt/qtest_gui.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtest_gui.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtest_gui.h"
Index: trunk/include/Qt/qtestaccessible.h
===================================================================
--- trunk/include/Qt/qtestaccessible.h	(revision 769)
+++ trunk/include/Qt/qtestaccessible.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestaccessible.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestaccessible.h"
Index: trunk/include/Qt/qtestassert.h
===================================================================
--- trunk/include/Qt/qtestassert.h	(revision 769)
+++ trunk/include/Qt/qtestassert.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestassert.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestassert.h"
Index: trunk/include/Qt/qtestbasicstreamer.h
===================================================================
--- trunk/include/Qt/qtestbasicstreamer.h	(revision 769)
+++ trunk/include/Qt/qtestbasicstreamer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestbasicstreamer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestbasicstreamer.h"
Index: trunk/include/Qt/qtestcase.h
===================================================================
--- trunk/include/Qt/qtestcase.h	(revision 769)
+++ trunk/include/Qt/qtestcase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestcase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestcase.h"
Index: trunk/include/Qt/qtestcoreelement.h
===================================================================
--- trunk/include/Qt/qtestcoreelement.h	(revision 769)
+++ trunk/include/Qt/qtestcoreelement.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestcoreelement.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestcoreelement.h"
Index: trunk/include/Qt/qtestcorelist.h
===================================================================
--- trunk/include/Qt/qtestcorelist.h	(revision 769)
+++ trunk/include/Qt/qtestcorelist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestcorelist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestcorelist.h"
Index: trunk/include/Qt/qtestdata.h
===================================================================
--- trunk/include/Qt/qtestdata.h	(revision 769)
+++ trunk/include/Qt/qtestdata.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestdata.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestdata.h"
Index: trunk/include/Qt/qtestelement.h
===================================================================
--- trunk/include/Qt/qtestelement.h	(revision 769)
+++ trunk/include/Qt/qtestelement.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestelement.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestelement.h"
Index: trunk/include/Qt/qtestelementattribute.h
===================================================================
--- trunk/include/Qt/qtestelementattribute.h	(revision 769)
+++ trunk/include/Qt/qtestelementattribute.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestelementattribute.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestelementattribute.h"
Index: trunk/include/Qt/qtestevent.h
===================================================================
--- trunk/include/Qt/qtestevent.h	(revision 769)
+++ trunk/include/Qt/qtestevent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestevent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestevent.h"
Index: trunk/include/Qt/qtesteventloop.h
===================================================================
--- trunk/include/Qt/qtesteventloop.h	(revision 769)
+++ trunk/include/Qt/qtesteventloop.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtesteventloop.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtesteventloop.h"
Index: trunk/include/Qt/qtestfilelogger.h
===================================================================
--- trunk/include/Qt/qtestfilelogger.h	(revision 769)
+++ trunk/include/Qt/qtestfilelogger.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestfilelogger.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestfilelogger.h"
Index: trunk/include/Qt/qtestkeyboard.h
===================================================================
--- trunk/include/Qt/qtestkeyboard.h	(revision 769)
+++ trunk/include/Qt/qtestkeyboard.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestkeyboard.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestkeyboard.h"
Index: trunk/include/Qt/qtestlightxmlstreamer.h
===================================================================
--- trunk/include/Qt/qtestlightxmlstreamer.h	(revision 769)
+++ trunk/include/Qt/qtestlightxmlstreamer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestlightxmlstreamer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestlightxmlstreamer.h"
Index: trunk/include/Qt/qtestmouse.h
===================================================================
--- trunk/include/Qt/qtestmouse.h	(revision 769)
+++ trunk/include/Qt/qtestmouse.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestmouse.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestmouse.h"
Index: trunk/include/Qt/qtestspontaneevent.h
===================================================================
--- trunk/include/Qt/qtestspontaneevent.h	(revision 769)
+++ trunk/include/Qt/qtestspontaneevent.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestspontaneevent.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestspontaneevent.h"
Index: trunk/include/Qt/qtestsystem.h
===================================================================
--- trunk/include/Qt/qtestsystem.h	(revision 769)
+++ trunk/include/Qt/qtestsystem.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestsystem.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestsystem.h"
Index: trunk/include/Qt/qtesttouch.h
===================================================================
--- trunk/include/Qt/qtesttouch.h	(revision 769)
+++ trunk/include/Qt/qtesttouch.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtesttouch.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtesttouch.h"
Index: trunk/include/Qt/qtestxmlstreamer.h
===================================================================
--- trunk/include/Qt/qtestxmlstreamer.h	(revision 769)
+++ trunk/include/Qt/qtestxmlstreamer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestxmlstreamer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestxmlstreamer.h"
Index: trunk/include/Qt/qtestxunitstreamer.h
===================================================================
--- trunk/include/Qt/qtestxunitstreamer.h	(revision 769)
+++ trunk/include/Qt/qtestxunitstreamer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/testlib/qtestxunitstreamer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtTest/qtestxunitstreamer.h"
Index: trunk/include/Qt/qtextboundaryfinder.h
===================================================================
--- trunk/include/Qt/qtextboundaryfinder.h	(revision 769)
+++ trunk/include/Qt/qtextboundaryfinder.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qtextboundaryfinder.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtextboundaryfinder.h"
Index: trunk/include/Qt/qtextbrowser.h
===================================================================
--- trunk/include/Qt/qtextbrowser.h	(revision 769)
+++ trunk/include/Qt/qtextbrowser.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtextbrowser.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextbrowser.h"
Index: trunk/include/Qt/qtextcodec.h
===================================================================
--- trunk/include/Qt/qtextcodec.h	(revision 769)
+++ trunk/include/Qt/qtextcodec.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/codecs/qtextcodec.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtextcodec.h"
Index: trunk/include/Qt/qtextcodecplugin.h
===================================================================
--- trunk/include/Qt/qtextcodecplugin.h	(revision 769)
+++ trunk/include/Qt/qtextcodecplugin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/codecs/qtextcodecplugin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtextcodecplugin.h"
Index: trunk/include/Qt/qtextcursor.h
===================================================================
--- trunk/include/Qt/qtextcursor.h	(revision 769)
+++ trunk/include/Qt/qtextcursor.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextcursor.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextcursor.h"
Index: trunk/include/Qt/qtextdocument.h
===================================================================
--- trunk/include/Qt/qtextdocument.h	(revision 769)
+++ trunk/include/Qt/qtextdocument.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextdocument.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextdocument.h"
Index: trunk/include/Qt/qtextdocumentfragment.h
===================================================================
--- trunk/include/Qt/qtextdocumentfragment.h	(revision 769)
+++ trunk/include/Qt/qtextdocumentfragment.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextdocumentfragment.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextdocumentfragment.h"
Index: trunk/include/Qt/qtextdocumentwriter.h
===================================================================
--- trunk/include/Qt/qtextdocumentwriter.h	(revision 769)
+++ trunk/include/Qt/qtextdocumentwriter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextdocumentwriter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextdocumentwriter.h"
Index: trunk/include/Qt/qtextedit.h
===================================================================
--- trunk/include/Qt/qtextedit.h	(revision 769)
+++ trunk/include/Qt/qtextedit.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtextedit.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextedit.h"
Index: trunk/include/Qt/qtextformat.h
===================================================================
--- trunk/include/Qt/qtextformat.h	(revision 769)
+++ trunk/include/Qt/qtextformat.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextformat.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextformat.h"
Index: trunk/include/Qt/qtextlayout.h
===================================================================
--- trunk/include/Qt/qtextlayout.h	(revision 769)
+++ trunk/include/Qt/qtextlayout.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextlayout.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextlayout.h"
Index: trunk/include/Qt/qtextlist.h
===================================================================
--- trunk/include/Qt/qtextlist.h	(revision 769)
+++ trunk/include/Qt/qtextlist.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextlist.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextlist.h"
Index: trunk/include/Qt/qtextobject.h
===================================================================
--- trunk/include/Qt/qtextobject.h	(revision 769)
+++ trunk/include/Qt/qtextobject.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextobject.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextobject.h"
Index: trunk/include/Qt/qtextoption.h
===================================================================
--- trunk/include/Qt/qtextoption.h	(revision 769)
+++ trunk/include/Qt/qtextoption.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtextoption.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtextoption.h"
Index: trunk/include/Qt/qtextstream.h
===================================================================
--- trunk/include/Qt/qtextstream.h	(revision 769)
+++ trunk/include/Qt/qtextstream.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qtextstream.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtextstream.h"
Index: trunk/include/Qt/qtexttable.h
===================================================================
--- trunk/include/Qt/qtexttable.h	(revision 769)
+++ trunk/include/Qt/qtexttable.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/text/qtexttable.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtexttable.h"
Index: trunk/include/Qt/qthread.h
===================================================================
--- trunk/include/Qt/qthread.h	(revision 769)
+++ trunk/include/Qt/qthread.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qthread.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qthread.h"
Index: trunk/include/Qt/qthreadpool.h
===================================================================
--- trunk/include/Qt/qthreadpool.h	(revision 769)
+++ trunk/include/Qt/qthreadpool.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/concurrent/qthreadpool.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qthreadpool.h"
Index: trunk/include/Qt/qthreadstorage.h
===================================================================
--- trunk/include/Qt/qthreadstorage.h	(revision 769)
+++ trunk/include/Qt/qthreadstorage.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qthreadstorage.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qthreadstorage.h"
Index: trunk/include/Qt/qtimeline.h
===================================================================
--- trunk/include/Qt/qtimeline.h	(revision 769)
+++ trunk/include/Qt/qtimeline.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qtimeline.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtimeline.h"
Index: trunk/include/Qt/qtimer.h
===================================================================
--- trunk/include/Qt/qtimer.h	(revision 769)
+++ trunk/include/Qt/qtimer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qtimer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtimer.h"
Index: trunk/include/Qt/qtoolbar.h
===================================================================
--- trunk/include/Qt/qtoolbar.h	(revision 769)
+++ trunk/include/Qt/qtoolbar.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtoolbar.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtoolbar.h"
Index: trunk/include/Qt/qtoolbox.h
===================================================================
--- trunk/include/Qt/qtoolbox.h	(revision 769)
+++ trunk/include/Qt/qtoolbox.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtoolbox.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtoolbox.h"
Index: trunk/include/Qt/qtoolbutton.h
===================================================================
--- trunk/include/Qt/qtoolbutton.h	(revision 769)
+++ trunk/include/Qt/qtoolbutton.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qtoolbutton.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtoolbutton.h"
Index: trunk/include/Qt/qtooltip.h
===================================================================
--- trunk/include/Qt/qtooltip.h	(revision 769)
+++ trunk/include/Qt/qtooltip.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qtooltip.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtooltip.h"
Index: trunk/include/Qt/qtransform.h
===================================================================
--- trunk/include/Qt/qtransform.h	(revision 769)
+++ trunk/include/Qt/qtransform.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qtransform.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtransform.h"
Index: trunk/include/Qt/qtranslator.h
===================================================================
--- trunk/include/Qt/qtranslator.h	(revision 769)
+++ trunk/include/Qt/qtranslator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qtranslator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qtranslator.h"
Index: trunk/include/Qt/qtransportauth_qws.h
===================================================================
--- trunk/include/Qt/qtransportauth_qws.h	(revision 769)
+++ trunk/include/Qt/qtransportauth_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qtransportauth_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtransportauth_qws.h"
Index: trunk/include/Qt/qtransportauthdefs_qws.h
===================================================================
--- trunk/include/Qt/qtransportauthdefs_qws.h	(revision 769)
+++ trunk/include/Qt/qtransportauthdefs_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qtransportauthdefs_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtransportauthdefs_qws.h"
Index: trunk/include/Qt/qtreeview.h
===================================================================
--- trunk/include/Qt/qtreeview.h	(revision 769)
+++ trunk/include/Qt/qtreeview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qtreeview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtreeview.h"
Index: trunk/include/Qt/qtreewidget.h
===================================================================
--- trunk/include/Qt/qtreewidget.h	(revision 769)
+++ trunk/include/Qt/qtreewidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qtreewidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtreewidget.h"
Index: trunk/include/Qt/qtreewidgetitemiterator.h
===================================================================
--- trunk/include/Qt/qtreewidgetitemiterator.h	(revision 769)
+++ trunk/include/Qt/qtreewidgetitemiterator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/itemviews/qtreewidgetitemiterator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qtreewidgetitemiterator.h"
Index: trunk/include/Qt/qudpsocket.h
===================================================================
--- trunk/include/Qt/qudpsocket.h	(revision 769)
+++ trunk/include/Qt/qudpsocket.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/socket/qudpsocket.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qudpsocket.h"
Index: trunk/include/Qt/qundogroup.h
===================================================================
--- trunk/include/Qt/qundogroup.h	(revision 769)
+++ trunk/include/Qt/qundogroup.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/util/qundogroup.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qundogroup.h"
Index: trunk/include/Qt/qundostack.h
===================================================================
--- trunk/include/Qt/qundostack.h	(revision 769)
+++ trunk/include/Qt/qundostack.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/util/qundostack.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qundostack.h"
Index: trunk/include/Qt/qundoview.h
===================================================================
--- trunk/include/Qt/qundoview.h	(revision 769)
+++ trunk/include/Qt/qundoview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/util/qundoview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qundoview.h"
Index: trunk/include/Qt/qurl.h
===================================================================
--- trunk/include/Qt/qurl.h	(revision 769)
+++ trunk/include/Qt/qurl.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/io/qurl.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qurl.h"
Index: trunk/include/Qt/qurlinfo.h
===================================================================
--- trunk/include/Qt/qurlinfo.h	(revision 769)
+++ trunk/include/Qt/qurlinfo.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/network/kernel/qurlinfo.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtNetwork/qurlinfo.h"
Index: trunk/include/Qt/quuid.h
===================================================================
--- trunk/include/Qt/quuid.h	(revision 769)
+++ trunk/include/Qt/quuid.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/plugin/quuid.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/quuid.h"
Index: trunk/include/Qt/qvalidator.h
===================================================================
--- trunk/include/Qt/qvalidator.h	(revision 769)
+++ trunk/include/Qt/qvalidator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qvalidator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qvalidator.h"
Index: trunk/include/Qt/qvariant.h
===================================================================
--- trunk/include/Qt/qvariant.h	(revision 769)
+++ trunk/include/Qt/qvariant.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/kernel/qvariant.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qvariant.h"
Index: trunk/include/Qt/qvariantanimation.h
===================================================================
--- trunk/include/Qt/qvariantanimation.h	(revision 769)
+++ trunk/include/Qt/qvariantanimation.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/animation/qvariantanimation.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qvariantanimation.h"
Index: trunk/include/Qt/qvarlengtharray.h
===================================================================
--- trunk/include/Qt/qvarlengtharray.h	(revision 769)
+++ trunk/include/Qt/qvarlengtharray.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qvarlengtharray.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qvarlengtharray.h"
Index: trunk/include/Qt/qvector.h
===================================================================
--- trunk/include/Qt/qvector.h	(revision 769)
+++ trunk/include/Qt/qvector.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/tools/qvector.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qvector.h"
Index: trunk/include/Qt/qvector2d.h
===================================================================
--- trunk/include/Qt/qvector2d.h	(revision 769)
+++ trunk/include/Qt/qvector2d.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/math3d/qvector2d.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qvector2d.h"
Index: trunk/include/Qt/qvector3d.h
===================================================================
--- trunk/include/Qt/qvector3d.h	(revision 769)
+++ trunk/include/Qt/qvector3d.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/math3d/qvector3d.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qvector3d.h"
Index: trunk/include/Qt/qvector4d.h
===================================================================
--- trunk/include/Qt/qvector4d.h	(revision 769)
+++ trunk/include/Qt/qvector4d.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/math3d/qvector4d.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qvector4d.h"
Index: trunk/include/Qt/qvfbhdr.h
===================================================================
--- trunk/include/Qt/qvfbhdr.h	(revision 769)
+++ trunk/include/Qt/qvfbhdr.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qvfbhdr.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qvfbhdr.h"
Index: trunk/include/Qt/qvg.h
===================================================================
--- trunk/include/Qt/qvg.h	(revision 769)
+++ trunk/include/Qt/qvg.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/openvg/qvg.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtOpenVG/qvg.h"
Index: trunk/include/Qt/qvideoframe.h
===================================================================
--- trunk/include/Qt/qvideoframe.h	(revision 769)
+++ trunk/include/Qt/qvideoframe.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/video/qvideoframe.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qvideoframe.h"
Index: trunk/include/Qt/qvideosurfaceformat.h
===================================================================
--- trunk/include/Qt/qvideosurfaceformat.h	(revision 769)
+++ trunk/include/Qt/qvideosurfaceformat.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/multimedia/video/qvideosurfaceformat.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtMultimedia/qvideosurfaceformat.h"
Index: trunk/include/Qt/qwaitcondition.h
===================================================================
--- trunk/include/Qt/qwaitcondition.h	(revision 769)
+++ trunk/include/Qt/qwaitcondition.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/corelib/thread/qwaitcondition.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qwaitcondition.h"
Index: trunk/include/Qt/qwebdatabase.h
===================================================================
--- trunk/include/Qt/qwebdatabase.h	(revision 769)
+++ trunk/include/Qt/qwebdatabase.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebdatabase.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebdatabase.h"
Index: trunk/include/Qt/qwebelement.h
===================================================================
--- trunk/include/Qt/qwebelement.h	(revision 769)
+++ trunk/include/Qt/qwebelement.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebelement.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebelement.h"
Index: trunk/include/Qt/qwebframe.h
===================================================================
--- trunk/include/Qt/qwebframe.h	(revision 769)
+++ trunk/include/Qt/qwebframe.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebframe.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebframe.h"
Index: trunk/include/Qt/qwebhistory.h
===================================================================
--- trunk/include/Qt/qwebhistory.h	(revision 769)
+++ trunk/include/Qt/qwebhistory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebhistory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebhistory.h"
Index: trunk/include/Qt/qwebhistoryinterface.h
===================================================================
--- trunk/include/Qt/qwebhistoryinterface.h	(revision 769)
+++ trunk/include/Qt/qwebhistoryinterface.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebhistoryinterface.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebhistoryinterface.h"
Index: trunk/include/Qt/qwebinspector.h
===================================================================
--- trunk/include/Qt/qwebinspector.h	(revision 769)
+++ trunk/include/Qt/qwebinspector.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebinspector.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebinspector.h"
Index: trunk/include/Qt/qwebkitglobal.h
===================================================================
--- trunk/include/Qt/qwebkitglobal.h	(revision 769)
+++ trunk/include/Qt/qwebkitglobal.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebkitglobal.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebkitglobal.h"
Index: trunk/include/Qt/qwebkitversion.h
===================================================================
--- trunk/include/Qt/qwebkitversion.h	(revision 769)
+++ trunk/include/Qt/qwebkitversion.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebkitversion.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebkitversion.h"
Index: trunk/include/Qt/qwebpage.h
===================================================================
--- trunk/include/Qt/qwebpage.h	(revision 769)
+++ trunk/include/Qt/qwebpage.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebpage.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebpage.h"
Index: trunk/include/Qt/qwebpluginfactory.h
===================================================================
--- trunk/include/Qt/qwebpluginfactory.h	(revision 769)
+++ trunk/include/Qt/qwebpluginfactory.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebpluginfactory.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebpluginfactory.h"
Index: trunk/include/Qt/qwebsecurityorigin.h
===================================================================
--- trunk/include/Qt/qwebsecurityorigin.h	(revision 769)
+++ trunk/include/Qt/qwebsecurityorigin.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebsecurityorigin.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebsecurityorigin.h"
Index: trunk/include/Qt/qwebsettings.h
===================================================================
--- trunk/include/Qt/qwebsettings.h	(revision 769)
+++ trunk/include/Qt/qwebsettings.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebsettings.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebsettings.h"
Index: trunk/include/Qt/qwebview.h
===================================================================
--- trunk/include/Qt/qwebview.h	(revision 769)
+++ trunk/include/Qt/qwebview.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/3rdparty/webkit/WebCore/../WebKit/qt/Api/qwebview.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtWebKit/qwebview.h"
Index: trunk/include/Qt/qwhatsthis.h
===================================================================
--- trunk/include/Qt/qwhatsthis.h	(revision 769)
+++ trunk/include/Qt/qwhatsthis.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qwhatsthis.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwhatsthis.h"
Index: trunk/include/Qt/qwidget.h
===================================================================
--- trunk/include/Qt/qwidget.h	(revision 769)
+++ trunk/include/Qt/qwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwidget.h"
Index: trunk/include/Qt/qwidgetaction.h
===================================================================
--- trunk/include/Qt/qwidgetaction.h	(revision 769)
+++ trunk/include/Qt/qwidgetaction.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qwidgetaction.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwidgetaction.h"
Index: trunk/include/Qt/qwindowdefs.h
===================================================================
--- trunk/include/Qt/qwindowdefs.h	(revision 769)
+++ trunk/include/Qt/qwindowdefs.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qwindowdefs.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowdefs.h"
Index: trunk/include/Qt/qwindowdefs_win.h
===================================================================
--- trunk/include/Qt/qwindowdefs_win.h	(revision 769)
+++ trunk/include/Qt/qwindowdefs_win.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qwindowdefs_win.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowdefs_win.h"
Index: trunk/include/Qt/qwindowscestyle.h
===================================================================
--- trunk/include/Qt/qwindowscestyle.h	(revision 769)
+++ trunk/include/Qt/qwindowscestyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qwindowscestyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowscestyle.h"
Index: trunk/include/Qt/qwindowsmobilestyle.h
===================================================================
--- trunk/include/Qt/qwindowsmobilestyle.h	(revision 769)
+++ trunk/include/Qt/qwindowsmobilestyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qwindowsmobilestyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowsmobilestyle.h"
Index: trunk/include/Qt/qwindowsstyle.h
===================================================================
--- trunk/include/Qt/qwindowsstyle.h	(revision 769)
+++ trunk/include/Qt/qwindowsstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qwindowsstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowsstyle.h"
Index: trunk/include/Qt/qwindowsvistastyle.h
===================================================================
--- trunk/include/Qt/qwindowsvistastyle.h	(revision 769)
+++ trunk/include/Qt/qwindowsvistastyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qwindowsvistastyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowsvistastyle.h"
Index: trunk/include/Qt/qwindowsxpstyle.h
===================================================================
--- trunk/include/Qt/qwindowsxpstyle.h	(revision 769)
+++ trunk/include/Qt/qwindowsxpstyle.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/styles/qwindowsxpstyle.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowsxpstyle.h"
Index: trunk/include/Qt/qwindowsystem_qws.h
===================================================================
--- trunk/include/Qt/qwindowsystem_qws.h	(revision 769)
+++ trunk/include/Qt/qwindowsystem_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwindowsystem_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwindowsystem_qws.h"
Index: trunk/include/Qt/qwizard.h
===================================================================
--- trunk/include/Qt/qwizard.h	(revision 769)
+++ trunk/include/Qt/qwizard.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/dialogs/qwizard.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwizard.h"
Index: trunk/include/Qt/qwmatrix.h
===================================================================
--- trunk/include/Qt/qwmatrix.h	(revision 769)
+++ trunk/include/Qt/qwmatrix.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/painting/qwmatrix.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwmatrix.h"
Index: trunk/include/Qt/qworkspace.h
===================================================================
--- trunk/include/Qt/qworkspace.h	(revision 769)
+++ trunk/include/Qt/qworkspace.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/widgets/qworkspace.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qworkspace.h"
Index: trunk/include/Qt/qwscursor_qws.h
===================================================================
--- trunk/include/Qt/qwscursor_qws.h	(revision 769)
+++ trunk/include/Qt/qwscursor_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwscursor_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwscursor_qws.h"
Index: trunk/include/Qt/qwsdisplay_qws.h
===================================================================
--- trunk/include/Qt/qwsdisplay_qws.h	(revision 769)
+++ trunk/include/Qt/qwsdisplay_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsdisplay_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsdisplay_qws.h"
Index: trunk/include/Qt/qwsembedwidget.h
===================================================================
--- trunk/include/Qt/qwsembedwidget.h	(revision 769)
+++ trunk/include/Qt/qwsembedwidget.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsembedwidget.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsembedwidget.h"
Index: trunk/include/Qt/qwsevent_qws.h
===================================================================
--- trunk/include/Qt/qwsevent_qws.h	(revision 769)
+++ trunk/include/Qt/qwsevent_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsevent_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsevent_qws.h"
Index: trunk/include/Qt/qwsmanager_qws.h
===================================================================
--- trunk/include/Qt/qwsmanager_qws.h	(revision 769)
+++ trunk/include/Qt/qwsmanager_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsmanager_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsmanager_qws.h"
Index: trunk/include/Qt/qwsproperty_qws.h
===================================================================
--- trunk/include/Qt/qwsproperty_qws.h	(revision 769)
+++ trunk/include/Qt/qwsproperty_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsproperty_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsproperty_qws.h"
Index: trunk/include/Qt/qwsprotocolitem_qws.h
===================================================================
--- trunk/include/Qt/qwsprotocolitem_qws.h	(revision 769)
+++ trunk/include/Qt/qwsprotocolitem_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsprotocolitem_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsprotocolitem_qws.h"
Index: trunk/include/Qt/qwssocket_qws.h
===================================================================
--- trunk/include/Qt/qwssocket_qws.h	(revision 769)
+++ trunk/include/Qt/qwssocket_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwssocket_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwssocket_qws.h"
Index: trunk/include/Qt/qwsutils_qws.h
===================================================================
--- trunk/include/Qt/qwsutils_qws.h	(revision 769)
+++ trunk/include/Qt/qwsutils_qws.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/embedded/qwsutils_qws.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qwsutils_qws.h"
Index: trunk/include/Qt/qx11embed_x11.h
===================================================================
--- trunk/include/Qt/qx11embed_x11.h	(revision 769)
+++ trunk/include/Qt/qx11embed_x11.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qx11embed_x11.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qx11embed_x11.h"
Index: trunk/include/Qt/qx11info_x11.h
===================================================================
--- trunk/include/Qt/qx11info_x11.h	(revision 769)
+++ trunk/include/Qt/qx11info_x11.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/gui/kernel/qx11info_x11.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtGui/qx11info_x11.h"
Index: trunk/include/Qt/qxml.h
===================================================================
--- trunk/include/Qt/qxml.h	(revision 769)
+++ trunk/include/Qt/qxml.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xml/sax/qxml.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXml/qxml.h"
Index: trunk/include/Qt/qxmlformatter.h
===================================================================
--- trunk/include/Qt/qxmlformatter.h	(revision 769)
+++ trunk/include/Qt/qxmlformatter.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlformatter.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlformatter.h"
Index: trunk/include/Qt/qxmlname.h
===================================================================
--- trunk/include/Qt/qxmlname.h	(revision 769)
+++ trunk/include/Qt/qxmlname.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlname.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlname.h"
Index: trunk/include/Qt/qxmlnamepool.h
===================================================================
--- trunk/include/Qt/qxmlnamepool.h	(revision 769)
+++ trunk/include/Qt/qxmlnamepool.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlnamepool.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlnamepool.h"
Index: trunk/include/Qt/qxmlquery.h
===================================================================
--- trunk/include/Qt/qxmlquery.h	(revision 769)
+++ trunk/include/Qt/qxmlquery.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlquery.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlquery.h"
Index: trunk/include/Qt/qxmlresultitems.h
===================================================================
--- trunk/include/Qt/qxmlresultitems.h	(revision 769)
+++ trunk/include/Qt/qxmlresultitems.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlresultitems.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlresultitems.h"
Index: trunk/include/Qt/qxmlschema.h
===================================================================
--- trunk/include/Qt/qxmlschema.h	(revision 769)
+++ trunk/include/Qt/qxmlschema.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlschema.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlschema.h"
Index: trunk/include/Qt/qxmlschemavalidator.h
===================================================================
--- trunk/include/Qt/qxmlschemavalidator.h	(revision 769)
+++ trunk/include/Qt/qxmlschemavalidator.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlschemavalidator.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlschemavalidator.h"
Index: trunk/include/Qt/qxmlserializer.h
===================================================================
--- trunk/include/Qt/qxmlserializer.h	(revision 769)
+++ trunk/include/Qt/qxmlserializer.h	(revision 846)
@@ -1,1 +1,9 @@
-#include "../../src/xmlpatterns/api/qxmlserializer.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtXmlPatterns/qxmlserializer.h"
Index: trunk/include/Qt/qxmlstream.h
===================================================================
--- trunk/include/Qt/qxmlstream.h	(revision 769)
+++ trunk/include/Qt/qxmlstream.h	(revision 846)
@@ -1,1 +1,10 @@
-#include "../../src/corelib/xml/qxmlstream.h"
+#ifndef QT_NO_QT_INCLUDE_WARN
+    #if defined(__GNUC__)
+        #warning "Inclusion of header files from include/Qt is deprecated."
+    #elif defined(_MSC_VER)
+        #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.")
+    #endif
+#endif
+
+#include "../QtCore/qxmlstream.h"
+#include "../QtXml/qxmlstream.h"
Index: trunk/include/Qt3Support/Qt3Support
===================================================================
--- trunk/include/Qt3Support/Qt3Support	(revision 769)
+++ trunk/include/Qt3Support/Qt3Support	(revision 846)
@@ -5,28 +5,8 @@
 #include <QtNetwork/QtNetwork>
 #include <QtSql/QtSql>
-#include "q3action.h"
-#include "q3button.h"
-#include "q3buttongroup.h"
-#include "q3combobox.h"
-#include "q3datetimeedit.h"
-#include "q3dockarea.h"
-#include "q3dockwindow.h"
-#include "q3frame.h"
-#include "q3grid.h"
-#include "q3gridview.h"
-#include "q3groupbox.h"
-#include "q3hbox.h"
-#include "q3header.h"
-#include "q3hgroupbox.h"
-#include "q3mainwindow.h"
-#include "q3popupmenu.h"
-#include "q3progressbar.h"
-#include "q3rangecontrol.h"
-#include "q3scrollview.h"
-#include "q3toolbar.h"
-#include "q3vbox.h"
-#include "q3vgroupbox.h"
-#include "q3whatsthis.h"
-#include "q3widgetstack.h"
+#include "q3filedialog.h"
+#include "q3progressdialog.h"
+#include "q3tabdialog.h"
+#include "q3wizard.h"
 #include "q3databrowser.h"
 #include "q3datatable.h"
@@ -40,27 +20,4 @@
 #include "q3sqlrecordinfo.h"
 #include "q3sqlselectcursor.h"
-#include "q3dns.h"
-#include "q3ftp.h"
-#include "q3http.h"
-#include "q3localfs.h"
-#include "q3network.h"
-#include "q3networkprotocol.h"
-#include "q3serversocket.h"
-#include "q3socket.h"
-#include "q3socketdevice.h"
-#include "q3url.h"
-#include "q3urloperator.h"
-#include "q3multilineedit.h"
-#include "q3simplerichtext.h"
-#include "q3stylesheet.h"
-#include "q3syntaxhighlighter.h"
-#include "q3textbrowser.h"
-#include "q3textedit.h"
-#include "q3textstream.h"
-#include "q3textview.h"
-#include "q3filedialog.h"
-#include "q3progressdialog.h"
-#include "q3tabdialog.h"
-#include "q3wizard.h"
 #include "q3accel.h"
 #include "q3boxlayout.h"
@@ -72,4 +29,13 @@
 #include "q3process.h"
 #include "qiconset.h"
+#include "q3canvas.h"
+#include "q3multilineedit.h"
+#include "q3simplerichtext.h"
+#include "q3stylesheet.h"
+#include "q3syntaxhighlighter.h"
+#include "q3textbrowser.h"
+#include "q3textedit.h"
+#include "q3textstream.h"
+#include "q3textview.h"
 #include "q3asciicache.h"
 #include "q3asciidict.h"
@@ -108,8 +74,42 @@
 #include "q3listview.h"
 #include "q3table.h"
+#include "q3action.h"
+#include "q3button.h"
+#include "q3buttongroup.h"
+#include "q3combobox.h"
+#include "q3datetimeedit.h"
+#include "q3dockarea.h"
+#include "q3dockwindow.h"
+#include "q3frame.h"
+#include "q3grid.h"
+#include "q3gridview.h"
+#include "q3groupbox.h"
+#include "q3hbox.h"
+#include "q3header.h"
+#include "q3hgroupbox.h"
+#include "q3mainwindow.h"
+#include "q3popupmenu.h"
+#include "q3progressbar.h"
+#include "q3rangecontrol.h"
+#include "q3scrollview.h"
+#include "q3toolbar.h"
+#include "q3vbox.h"
+#include "q3vgroupbox.h"
+#include "q3whatsthis.h"
+#include "q3widgetstack.h"
+#include "q3dns.h"
+#include "q3ftp.h"
+#include "q3http.h"
+#include "q3localfs.h"
+#include "q3network.h"
+#include "q3networkprotocol.h"
+#include "q3serversocket.h"
+#include "q3socket.h"
+#include "q3socketdevice.h"
+#include "q3url.h"
+#include "q3urloperator.h"
 #include "q3paintdevicemetrics.h"
 #include "q3painter.h"
 #include "q3picture.h"
 #include "q3pointarray.h"
-#include "q3canvas.h"
 #endif
Index: trunk/include/Qt3Support/headers.pri
===================================================================
--- trunk/include/Qt3Support/headers.pri	(revision 769)
+++ trunk/include/Qt3Support/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../qt3support/widgets/q3action.h ../qt3support/widgets/q3button.h ../qt3support/widgets/q3buttongroup.h ../qt3support/widgets/q3combobox.h ../qt3support/widgets/q3datetimeedit.h ../qt3support/widgets/q3dockarea.h ../qt3support/widgets/q3dockwindow.h ../qt3support/widgets/q3frame.h ../qt3support/widgets/q3grid.h ../qt3support/widgets/q3gridview.h ../qt3support/widgets/q3groupbox.h ../qt3support/widgets/q3hbox.h ../qt3support/widgets/q3header.h ../qt3support/widgets/q3hgroupbox.h ../qt3support/widgets/q3mainwindow.h ../qt3support/widgets/q3popupmenu.h ../qt3support/widgets/q3progressbar.h ../qt3support/widgets/q3rangecontrol.h ../qt3support/widgets/q3scrollview.h ../qt3support/widgets/q3toolbar.h ../qt3support/widgets/q3vbox.h ../qt3support/widgets/q3vgroupbox.h ../qt3support/widgets/q3whatsthis.h ../qt3support/widgets/q3widgetstack.h ../qt3support/sql/q3databrowser.h ../qt3support/sql/q3datatable.h ../qt3support/sql/q3dataview.h ../qt3support/sql/q3editorfactory.h ../qt3support/sql/q3sqlcursor.h ../qt3support/sql/q3sqleditorfactory.h ../qt3support/sql/q3sqlfieldinfo.h ../qt3support/sql/q3sqlform.h ../qt3support/sql/q3sqlpropertymap.h ../qt3support/sql/q3sqlrecordinfo.h ../qt3support/sql/q3sqlselectcursor.h ../qt3support/network/q3dns.h ../qt3support/network/q3ftp.h ../qt3support/network/q3http.h ../qt3support/network/q3localfs.h ../qt3support/network/q3network.h ../qt3support/network/q3networkprotocol.h ../qt3support/network/q3serversocket.h ../qt3support/network/q3socket.h ../qt3support/network/q3socketdevice.h ../qt3support/network/q3url.h ../qt3support/network/q3urloperator.h ../qt3support/text/q3multilineedit.h ../qt3support/text/q3simplerichtext.h ../qt3support/text/q3stylesheet.h ../qt3support/text/q3syntaxhighlighter.h ../qt3support/text/q3textbrowser.h ../qt3support/text/q3textedit.h ../qt3support/text/q3textstream.h ../qt3support/text/q3textview.h ../qt3support/dialogs/q3filedialog.h ../qt3support/dialogs/q3progressdialog.h ../qt3support/dialogs/q3tabdialog.h ../qt3support/dialogs/q3wizard.h ../qt3support/other/q3accel.h ../qt3support/other/q3boxlayout.h ../qt3support/other/q3dragobject.h ../qt3support/other/q3dropsite.h ../qt3support/other/q3gridlayout.h ../qt3support/other/q3mimefactory.h ../qt3support/other/q3polygonscanner.h ../qt3support/other/q3process.h ../qt3support/other/qiconset.h ../qt3support/tools/q3asciicache.h ../qt3support/tools/q3asciidict.h ../qt3support/tools/q3cache.h ../qt3support/tools/q3cleanuphandler.h ../qt3support/tools/q3cstring.h ../qt3support/tools/q3deepcopy.h ../qt3support/tools/q3dict.h ../qt3support/tools/q3garray.h ../qt3support/tools/q3gcache.h ../qt3support/tools/q3gdict.h ../qt3support/tools/q3glist.h ../qt3support/tools/q3gvector.h ../qt3support/tools/q3intcache.h ../qt3support/tools/q3intdict.h ../qt3support/tools/q3memarray.h ../qt3support/tools/q3objectdict.h ../qt3support/tools/q3ptrcollection.h ../qt3support/tools/q3ptrdict.h ../qt3support/tools/q3ptrlist.h ../qt3support/tools/q3ptrqueue.h ../qt3support/tools/q3ptrstack.h ../qt3support/tools/q3ptrvector.h ../qt3support/tools/q3semaphore.h ../qt3support/tools/q3shared.h ../qt3support/tools/q3signal.h ../qt3support/tools/q3sortedlist.h ../qt3support/tools/q3strlist.h ../qt3support/tools/q3strvec.h ../qt3support/tools/q3tl.h ../qt3support/tools/q3valuelist.h ../qt3support/tools/q3valuestack.h ../qt3support/tools/q3valuevector.h ../qt3support/itemviews/q3iconview.h ../qt3support/itemviews/q3listbox.h ../qt3support/itemviews/q3listview.h ../qt3support/itemviews/q3table.h ../qt3support/painting/q3paintdevicemetrics.h ../qt3support/painting/q3painter.h ../qt3support/painting/q3picture.h ../qt3support/painting/q3pointarray.h ../qt3support/canvas/q3canvas.h ../../include/Qt3Support/Qt3Support 
-SYNCQT.HEADER_CLASSES = ../../include/Qt3Support/Q3Action ../../include/Qt3Support/Q3ActionGroup ../../include/Qt3Support/Q3Button ../../include/Qt3Support/Q3ButtonGroup ../../include/Qt3Support/Q3VButtonGroup ../../include/Qt3Support/Q3HButtonGroup ../../include/Qt3Support/Q3ComboBox ../../include/Qt3Support/Q3DateTimeEditBase ../../include/Qt3Support/Q3DateEdit ../../include/Qt3Support/Q3TimeEdit ../../include/Qt3Support/Q3DateTimeEdit ../../include/Qt3Support/Q3DockAreaLayout ../../include/Qt3Support/Q3DockArea ../../include/Qt3Support/Q3DockWindow ../../include/Qt3Support/Q3Frame ../../include/Qt3Support/Q3Grid ../../include/Qt3Support/Q3GridView ../../include/Qt3Support/Q3GroupBox ../../include/Qt3Support/Q3HBox ../../include/Qt3Support/Q3Header ../../include/Qt3Support/Q3HGroupBox ../../include/Qt3Support/Q3MainWindow ../../include/Qt3Support/Q3PopupMenu ../../include/Qt3Support/Q3ProgressBar ../../include/Qt3Support/Q3RangeControl ../../include/Qt3Support/Q3SpinWidget ../../include/Qt3Support/Q3ScrollView ../../include/Qt3Support/Q3ToolBar ../../include/Qt3Support/Q3VBox ../../include/Qt3Support/Q3VGroupBox ../../include/Qt3Support/Q3WhatsThis ../../include/Qt3Support/Q3WidgetStack ../../include/Qt3Support/Q3DataBrowser ../../include/Qt3Support/Q3DataTable ../../include/Qt3Support/Q3DataView ../../include/Qt3Support/Q3EditorFactory ../../include/Qt3Support/Q3SqlCursor ../../include/Qt3Support/Q3SqlEditorFactory ../../include/Qt3Support/Q3SqlFieldInfo ../../include/Qt3Support/Q3SqlForm ../../include/Qt3Support/Q3SqlPropertyMap ../../include/Qt3Support/Q3SqlFieldInfoList ../../include/Qt3Support/Q3SqlRecordInfo ../../include/Qt3Support/Q3SqlSelectCursor ../../include/Qt3Support/Q3Dns ../../include/Qt3Support/Q3DnsSocket ../../include/Qt3Support/Q3Ftp ../../include/Qt3Support/Q3HttpHeader ../../include/Qt3Support/Q3HttpResponseHeader ../../include/Qt3Support/Q3HttpRequestHeader ../../include/Qt3Support/Q3Http ../../include/Qt3Support/Q3LocalFs ../../include/Qt3Support/Q3NetworkProtocolFactoryBase ../../include/Qt3Support/Q3NetworkProtocolFactory ../../include/Qt3Support/Q3NetworkProtocolDict ../../include/Qt3Support/Q3NetworkProtocol ../../include/Qt3Support/Q3NetworkOperation ../../include/Qt3Support/Q3ServerSocket ../../include/Qt3Support/Q3Socket ../../include/Qt3Support/Q3SocketDevice ../../include/Qt3Support/Q3Url ../../include/Qt3Support/Q3UrlOperator ../../include/Qt3Support/Q3MultiLineEdit ../../include/Qt3Support/Q3SimpleRichText ../../include/Qt3Support/Q3StyleSheetItem ../../include/Qt3Support/Q3StyleSheet ../../include/Qt3Support/Q3SyntaxHighlighter ../../include/Qt3Support/Q3TextBrowser ../../include/Qt3Support/Q3TextEditOptimPrivate ../../include/Qt3Support/Q3TextEdit ../../include/Qt3Support/Q3TextStream ../../include/Qt3Support/Q3TSFUNC ../../include/Qt3Support/Q3TextView ../../include/Qt3Support/Q3FileIconProvider ../../include/Qt3Support/Q3FilePreview ../../include/Qt3Support/Q3FileDialog ../../include/Qt3Support/Q3ProgressDialog ../../include/Qt3Support/Q3TabDialog ../../include/Qt3Support/Q3Wizard ../../include/Qt3Support/Q3Accel ../../include/Qt3Support/Q3BoxLayout ../../include/Qt3Support/Q3HBoxLayout ../../include/Qt3Support/Q3VBoxLayout ../../include/Qt3Support/Q3DragObject ../../include/Qt3Support/Q3StoredDrag ../../include/Qt3Support/Q3TextDrag ../../include/Qt3Support/Q3ImageDrag ../../include/Qt3Support/Q3UriDrag ../../include/Qt3Support/Q3ColorDrag ../../include/Qt3Support/Q3DropSite ../../include/Qt3Support/Q3GridLayout ../../include/Qt3Support/Q3MimeSourceFactory ../../include/Qt3Support/Q3PolygonScanner ../../include/Qt3Support/Q3Process ../../include/Qt3Support/Q3AsciiCache ../../include/Qt3Support/Q3AsciiCacheIterator ../../include/Qt3Support/Q3AsciiDict ../../include/Qt3Support/Q3AsciiDictIterator ../../include/Qt3Support/Q3Cache ../../include/Qt3Support/Q3CacheIterator ../../include/Qt3Support/Q3CleanupHandler ../../include/Qt3Support/Q3SingleCleanupHandler ../../include/Qt3Support/Q3CString ../../include/Qt3Support/Q3DeepCopy ../../include/Qt3Support/Q3Dict ../../include/Qt3Support/Q3DictIterator ../../include/Qt3Support/Q3GArray ../../include/Qt3Support/Q3GCache ../../include/Qt3Support/Q3GCacheIterator ../../include/Qt3Support/Q3BaseBucket ../../include/Qt3Support/Q3StringBucket ../../include/Qt3Support/Q3AsciiBucket ../../include/Qt3Support/Q3IntBucket ../../include/Qt3Support/Q3PtrBucket ../../include/Qt3Support/Q3GDict ../../include/Qt3Support/Q3GDictIterator ../../include/Qt3Support/Q3LNode ../../include/Qt3Support/Q3GList ../../include/Qt3Support/Q3GListIterator ../../include/Qt3Support/Q3GListStdIterator ../../include/Qt3Support/Q3GVector ../../include/Qt3Support/Q3IntCache ../../include/Qt3Support/Q3IntCacheIterator ../../include/Qt3Support/Q3IntDict ../../include/Qt3Support/Q3IntDictIterator ../../include/Qt3Support/Q3MemArray ../../include/Qt3Support/Q3ObjectDictionary ../../include/Qt3Support/Q3PtrCollection ../../include/Qt3Support/Q3PtrDict ../../include/Qt3Support/Q3PtrDictIterator ../../include/Qt3Support/Q3PtrListStdIterator ../../include/Qt3Support/Q3PtrList ../../include/Qt3Support/Q3PtrListIterator ../../include/Qt3Support/Q3PtrQueue ../../include/Qt3Support/Q3PtrStack ../../include/Qt3Support/Q3PtrVector ../../include/Qt3Support/Q3Semaphore ../../include/Qt3Support/Q3Shared ../../include/Qt3Support/Q3Signal ../../include/Qt3Support/Q3SortedList ../../include/Qt3Support/Q3StrListIterator ../../include/Qt3Support/Q3StrList ../../include/Qt3Support/Q3StrIList ../../include/Qt3Support/Q3StrVec ../../include/Qt3Support/Q3StrIVec ../../include/Qt3Support/Q3ValueListIterator ../../include/Qt3Support/Q3ValueListConstIterator ../../include/Qt3Support/Q3ValueList ../../include/Qt3Support/Q3ValueStack ../../include/Qt3Support/Q3ValueVector ../../include/Qt3Support/Q3IconDragItem ../../include/Qt3Support/Q3IconDrag ../../include/Qt3Support/Q3IconViewItem ../../include/Qt3Support/Q3IconView ../../include/Qt3Support/Q3ListBox ../../include/Qt3Support/Q3ListBoxItem ../../include/Qt3Support/Q3ListBoxText ../../include/Qt3Support/Q3ListBoxPixmap ../../include/Qt3Support/Q3ListViewItem ../../include/Qt3Support/Q3ListView ../../include/Qt3Support/Q3CheckListItem ../../include/Qt3Support/Q3ListViewItemIterator ../../include/Qt3Support/Q3TableSelection ../../include/Qt3Support/Q3TableItem ../../include/Qt3Support/Q3ComboTableItem ../../include/Qt3Support/Q3CheckTableItem ../../include/Qt3Support/Q3Table ../../include/Qt3Support/Q3PaintDeviceMetrics ../../include/Qt3Support/Q3Painter ../../include/Qt3Support/Q3Picture ../../include/Qt3Support/Q3PointArray ../../include/Qt3Support/Q3CanvasItemList ../../include/Qt3Support/Q3CanvasItem ../../include/Qt3Support/Q3Canvas ../../include/Qt3Support/Q3CanvasView ../../include/Qt3Support/Q3CanvasPixmap ../../include/Qt3Support/Q3CanvasPixmapArray ../../include/Qt3Support/Q3CanvasSprite ../../include/Qt3Support/Q3CanvasPolygonalItem ../../include/Qt3Support/Q3CanvasRectangle ../../include/Qt3Support/Q3CanvasPolygon ../../include/Qt3Support/Q3CanvasSpline ../../include/Qt3Support/Q3CanvasLine ../../include/Qt3Support/Q3CanvasEllipse ../../include/Qt3Support/Q3CanvasText 
-SYNCQT.PRIVATE_HEADER_FILES = ../qt3support/widgets/q3mainwindow_p.h ../qt3support/widgets/q3titlebar_p.h ../qt3support/sql/q3sqlmanager_p.h ../qt3support/text/q3richtext_p.h ../qt3support/text/q3syntaxhighlighter_p.h ../qt3support/other/q3membuf_p.h ../qt3support/other/qt_compat_pch.h ../qt3support/painting/q3paintengine_svg_p.h 
+SYNCQT.HEADER_FILES = ../qt3support/dialogs/q3filedialog.h ../qt3support/dialogs/q3progressdialog.h ../qt3support/dialogs/q3tabdialog.h ../qt3support/dialogs/q3wizard.h ../qt3support/sql/q3databrowser.h ../qt3support/sql/q3datatable.h ../qt3support/sql/q3dataview.h ../qt3support/sql/q3editorfactory.h ../qt3support/sql/q3sqlcursor.h ../qt3support/sql/q3sqleditorfactory.h ../qt3support/sql/q3sqlfieldinfo.h ../qt3support/sql/q3sqlform.h ../qt3support/sql/q3sqlpropertymap.h ../qt3support/sql/q3sqlrecordinfo.h ../qt3support/sql/q3sqlselectcursor.h ../qt3support/other/q3accel.h ../qt3support/other/q3boxlayout.h ../qt3support/other/q3dragobject.h ../qt3support/other/q3dropsite.h ../qt3support/other/q3gridlayout.h ../qt3support/other/q3mimefactory.h ../qt3support/other/q3polygonscanner.h ../qt3support/other/q3process.h ../qt3support/other/qiconset.h ../qt3support/canvas/q3canvas.h ../qt3support/text/q3multilineedit.h ../qt3support/text/q3simplerichtext.h ../qt3support/text/q3stylesheet.h ../qt3support/text/q3syntaxhighlighter.h ../qt3support/text/q3textbrowser.h ../qt3support/text/q3textedit.h ../qt3support/text/q3textstream.h ../qt3support/text/q3textview.h ../qt3support/tools/q3asciicache.h ../qt3support/tools/q3asciidict.h ../qt3support/tools/q3cache.h ../qt3support/tools/q3cleanuphandler.h ../qt3support/tools/q3cstring.h ../qt3support/tools/q3deepcopy.h ../qt3support/tools/q3dict.h ../qt3support/tools/q3garray.h ../qt3support/tools/q3gcache.h ../qt3support/tools/q3gdict.h ../qt3support/tools/q3glist.h ../qt3support/tools/q3gvector.h ../qt3support/tools/q3intcache.h ../qt3support/tools/q3intdict.h ../qt3support/tools/q3memarray.h ../qt3support/tools/q3objectdict.h ../qt3support/tools/q3ptrcollection.h ../qt3support/tools/q3ptrdict.h ../qt3support/tools/q3ptrlist.h ../qt3support/tools/q3ptrqueue.h ../qt3support/tools/q3ptrstack.h ../qt3support/tools/q3ptrvector.h ../qt3support/tools/q3semaphore.h ../qt3support/tools/q3shared.h ../qt3support/tools/q3signal.h ../qt3support/tools/q3sortedlist.h ../qt3support/tools/q3strlist.h ../qt3support/tools/q3strvec.h ../qt3support/tools/q3tl.h ../qt3support/tools/q3valuelist.h ../qt3support/tools/q3valuestack.h ../qt3support/tools/q3valuevector.h ../qt3support/itemviews/q3iconview.h ../qt3support/itemviews/q3listbox.h ../qt3support/itemviews/q3listview.h ../qt3support/itemviews/q3table.h ../qt3support/widgets/q3action.h ../qt3support/widgets/q3button.h ../qt3support/widgets/q3buttongroup.h ../qt3support/widgets/q3combobox.h ../qt3support/widgets/q3datetimeedit.h ../qt3support/widgets/q3dockarea.h ../qt3support/widgets/q3dockwindow.h ../qt3support/widgets/q3frame.h ../qt3support/widgets/q3grid.h ../qt3support/widgets/q3gridview.h ../qt3support/widgets/q3groupbox.h ../qt3support/widgets/q3hbox.h ../qt3support/widgets/q3header.h ../qt3support/widgets/q3hgroupbox.h ../qt3support/widgets/q3mainwindow.h ../qt3support/widgets/q3popupmenu.h ../qt3support/widgets/q3progressbar.h ../qt3support/widgets/q3rangecontrol.h ../qt3support/widgets/q3scrollview.h ../qt3support/widgets/q3toolbar.h ../qt3support/widgets/q3vbox.h ../qt3support/widgets/q3vgroupbox.h ../qt3support/widgets/q3whatsthis.h ../qt3support/widgets/q3widgetstack.h ../qt3support/network/q3dns.h ../qt3support/network/q3ftp.h ../qt3support/network/q3http.h ../qt3support/network/q3localfs.h ../qt3support/network/q3network.h ../qt3support/network/q3networkprotocol.h ../qt3support/network/q3serversocket.h ../qt3support/network/q3socket.h ../qt3support/network/q3socketdevice.h ../qt3support/network/q3url.h ../qt3support/network/q3urloperator.h ../qt3support/painting/q3paintdevicemetrics.h ../qt3support/painting/q3painter.h ../qt3support/painting/q3picture.h ../qt3support/painting/q3pointarray.h ../../include/Qt3Support/Qt3Support 
+SYNCQT.HEADER_CLASSES = ../../include/Qt3Support/Q3FileIconProvider ../../include/Qt3Support/Q3FilePreview ../../include/Qt3Support/Q3FileDialog ../../include/Qt3Support/Q3ProgressDialog ../../include/Qt3Support/Q3TabDialog ../../include/Qt3Support/Q3Wizard ../../include/Qt3Support/Q3DataBrowser ../../include/Qt3Support/Q3DataTable ../../include/Qt3Support/Q3DataView ../../include/Qt3Support/Q3EditorFactory ../../include/Qt3Support/Q3SqlCursor ../../include/Qt3Support/Q3SqlEditorFactory ../../include/Qt3Support/Q3SqlFieldInfo ../../include/Qt3Support/Q3SqlForm ../../include/Qt3Support/Q3SqlPropertyMap ../../include/Qt3Support/Q3SqlFieldInfoList ../../include/Qt3Support/Q3SqlRecordInfo ../../include/Qt3Support/Q3SqlSelectCursor ../../include/Qt3Support/Q3Accel ../../include/Qt3Support/Q3BoxLayout ../../include/Qt3Support/Q3HBoxLayout ../../include/Qt3Support/Q3VBoxLayout ../../include/Qt3Support/Q3DragObject ../../include/Qt3Support/Q3StoredDrag ../../include/Qt3Support/Q3TextDrag ../../include/Qt3Support/Q3ImageDrag ../../include/Qt3Support/Q3UriDrag ../../include/Qt3Support/Q3ColorDrag ../../include/Qt3Support/Q3DropSite ../../include/Qt3Support/Q3GridLayout ../../include/Qt3Support/Q3MimeSourceFactory ../../include/Qt3Support/Q3PolygonScanner ../../include/Qt3Support/Q3Process ../../include/Qt3Support/Q3CanvasItemList ../../include/Qt3Support/Q3CanvasItem ../../include/Qt3Support/Q3Canvas ../../include/Qt3Support/Q3CanvasView ../../include/Qt3Support/Q3CanvasPixmap ../../include/Qt3Support/Q3CanvasPixmapArray ../../include/Qt3Support/Q3CanvasSprite ../../include/Qt3Support/Q3CanvasPolygonalItem ../../include/Qt3Support/Q3CanvasRectangle ../../include/Qt3Support/Q3CanvasPolygon ../../include/Qt3Support/Q3CanvasSpline ../../include/Qt3Support/Q3CanvasLine ../../include/Qt3Support/Q3CanvasEllipse ../../include/Qt3Support/Q3CanvasText ../../include/Qt3Support/Q3MultiLineEdit ../../include/Qt3Support/Q3SimpleRichText ../../include/Qt3Support/Q3StyleSheetItem ../../include/Qt3Support/Q3StyleSheet ../../include/Qt3Support/Q3SyntaxHighlighter ../../include/Qt3Support/Q3TextBrowser ../../include/Qt3Support/Q3TextEditOptimPrivate ../../include/Qt3Support/Q3TextEdit ../../include/Qt3Support/Q3TextStream ../../include/Qt3Support/Q3TSFUNC ../../include/Qt3Support/Q3TextView ../../include/Qt3Support/Q3AsciiCache ../../include/Qt3Support/Q3AsciiCacheIterator ../../include/Qt3Support/Q3AsciiDict ../../include/Qt3Support/Q3AsciiDictIterator ../../include/Qt3Support/Q3Cache ../../include/Qt3Support/Q3CacheIterator ../../include/Qt3Support/Q3CleanupHandler ../../include/Qt3Support/Q3SingleCleanupHandler ../../include/Qt3Support/Q3CString ../../include/Qt3Support/Q3DeepCopy ../../include/Qt3Support/Q3Dict ../../include/Qt3Support/Q3DictIterator ../../include/Qt3Support/Q3GArray ../../include/Qt3Support/Q3GCache ../../include/Qt3Support/Q3GCacheIterator ../../include/Qt3Support/Q3BaseBucket ../../include/Qt3Support/Q3StringBucket ../../include/Qt3Support/Q3AsciiBucket ../../include/Qt3Support/Q3IntBucket ../../include/Qt3Support/Q3PtrBucket ../../include/Qt3Support/Q3GDict ../../include/Qt3Support/Q3GDictIterator ../../include/Qt3Support/Q3LNode ../../include/Qt3Support/Q3GList ../../include/Qt3Support/Q3GListIterator ../../include/Qt3Support/Q3GListStdIterator ../../include/Qt3Support/Q3GVector ../../include/Qt3Support/Q3IntCache ../../include/Qt3Support/Q3IntCacheIterator ../../include/Qt3Support/Q3IntDict ../../include/Qt3Support/Q3IntDictIterator ../../include/Qt3Support/Q3MemArray ../../include/Qt3Support/Q3ObjectDictionary ../../include/Qt3Support/Q3PtrCollection ../../include/Qt3Support/Q3PtrDict ../../include/Qt3Support/Q3PtrDictIterator ../../include/Qt3Support/Q3PtrListStdIterator ../../include/Qt3Support/Q3PtrList ../../include/Qt3Support/Q3PtrListIterator ../../include/Qt3Support/Q3PtrQueue ../../include/Qt3Support/Q3PtrStack ../../include/Qt3Support/Q3PtrVector ../../include/Qt3Support/Q3Semaphore ../../include/Qt3Support/Q3Shared ../../include/Qt3Support/Q3Signal ../../include/Qt3Support/Q3SortedList ../../include/Qt3Support/Q3StrListIterator ../../include/Qt3Support/Q3StrList ../../include/Qt3Support/Q3StrIList ../../include/Qt3Support/Q3StrVec ../../include/Qt3Support/Q3StrIVec ../../include/Qt3Support/Q3ValueListIterator ../../include/Qt3Support/Q3ValueListConstIterator ../../include/Qt3Support/Q3ValueList ../../include/Qt3Support/Q3ValueStack ../../include/Qt3Support/Q3ValueVector ../../include/Qt3Support/Q3IconDragItem ../../include/Qt3Support/Q3IconDrag ../../include/Qt3Support/Q3IconViewItem ../../include/Qt3Support/Q3IconView ../../include/Qt3Support/Q3ListBox ../../include/Qt3Support/Q3ListBoxItem ../../include/Qt3Support/Q3ListBoxText ../../include/Qt3Support/Q3ListBoxPixmap ../../include/Qt3Support/Q3ListViewItem ../../include/Qt3Support/Q3ListView ../../include/Qt3Support/Q3CheckListItem ../../include/Qt3Support/Q3ListViewItemIterator ../../include/Qt3Support/Q3TableSelection ../../include/Qt3Support/Q3TableItem ../../include/Qt3Support/Q3ComboTableItem ../../include/Qt3Support/Q3CheckTableItem ../../include/Qt3Support/Q3Table ../../include/Qt3Support/Q3Action ../../include/Qt3Support/Q3ActionGroup ../../include/Qt3Support/Q3Button ../../include/Qt3Support/Q3ButtonGroup ../../include/Qt3Support/Q3VButtonGroup ../../include/Qt3Support/Q3HButtonGroup ../../include/Qt3Support/Q3ComboBox ../../include/Qt3Support/Q3DateTimeEditBase ../../include/Qt3Support/Q3DateEdit ../../include/Qt3Support/Q3TimeEdit ../../include/Qt3Support/Q3DateTimeEdit ../../include/Qt3Support/Q3DockAreaLayout ../../include/Qt3Support/Q3DockArea ../../include/Qt3Support/Q3DockWindow ../../include/Qt3Support/Q3Frame ../../include/Qt3Support/Q3Grid ../../include/Qt3Support/Q3GridView ../../include/Qt3Support/Q3GroupBox ../../include/Qt3Support/Q3HBox ../../include/Qt3Support/Q3Header ../../include/Qt3Support/Q3HGroupBox ../../include/Qt3Support/Q3MainWindow ../../include/Qt3Support/Q3PopupMenu ../../include/Qt3Support/Q3ProgressBar ../../include/Qt3Support/Q3RangeControl ../../include/Qt3Support/Q3SpinWidget ../../include/Qt3Support/Q3ScrollView ../../include/Qt3Support/Q3ToolBar ../../include/Qt3Support/Q3VBox ../../include/Qt3Support/Q3VGroupBox ../../include/Qt3Support/Q3WhatsThis ../../include/Qt3Support/Q3WidgetStack ../../include/Qt3Support/Q3Dns ../../include/Qt3Support/Q3DnsSocket ../../include/Qt3Support/Q3Ftp ../../include/Qt3Support/Q3HttpHeader ../../include/Qt3Support/Q3HttpResponseHeader ../../include/Qt3Support/Q3HttpRequestHeader ../../include/Qt3Support/Q3Http ../../include/Qt3Support/Q3LocalFs ../../include/Qt3Support/Q3NetworkProtocolFactoryBase ../../include/Qt3Support/Q3NetworkProtocolFactory ../../include/Qt3Support/Q3NetworkProtocolDict ../../include/Qt3Support/Q3NetworkProtocol ../../include/Qt3Support/Q3NetworkOperation ../../include/Qt3Support/Q3ServerSocket ../../include/Qt3Support/Q3Socket ../../include/Qt3Support/Q3SocketDevice ../../include/Qt3Support/Q3Url ../../include/Qt3Support/Q3UrlOperator ../../include/Qt3Support/Q3PaintDeviceMetrics ../../include/Qt3Support/Q3Painter ../../include/Qt3Support/Q3Picture ../../include/Qt3Support/Q3PointArray 
+SYNCQT.PRIVATE_HEADER_FILES = ../qt3support/sql/q3sqlmanager_p.h ../qt3support/other/q3membuf_p.h ../qt3support/other/qt_compat_pch.h ../qt3support/text/q3richtext_p.h ../qt3support/text/q3syntaxhighlighter_p.h ../qt3support/widgets/q3mainwindow_p.h ../qt3support/widgets/q3titlebar_p.h ../qt3support/painting/q3paintengine_svg_p.h 
Index: trunk/include/QtCore/QElapsedTimer
===================================================================
--- trunk/include/QtCore/QElapsedTimer	(revision 846)
+++ trunk/include/QtCore/QElapsedTimer	(revision 846)
@@ -0,0 +1,1 @@
+#include "qelapsedtimer.h"
Index: trunk/include/QtCore/QtConfig
===================================================================
--- trunk/include/QtCore/QtConfig	(revision 846)
+++ trunk/include/QtCore/QtConfig	(revision 846)
@@ -0,0 +1,1 @@
+#include "qconfig.h"
Index: trunk/include/QtCore/QtCore
===================================================================
--- trunk/include/QtCore/QtCore	(revision 769)
+++ trunk/include/QtCore/QtCore	(revision 846)
@@ -1,24 +1,51 @@
 #ifndef QT_QTCORE_MODULE_H
 #define QT_QTCORE_MODULE_H
-#include "qxmlstream.h"
-#include "qabstractfileengine.h"
-#include "qbuffer.h"
-#include "qdatastream.h"
-#include "qdebug.h"
-#include "qdir.h"
-#include "qdiriterator.h"
-#include "qfile.h"
-#include "qfileinfo.h"
-#include "qfilesystemwatcher.h"
-#include "qfsfileengine.h"
-#include "qiodevice.h"
-#include "qprocess.h"
-#include "qresource.h"
-#include "qsettings.h"
-#include "qtemporaryfile.h"
-#include "qtextstream.h"
-#include "qurl.h"
-#include "qtextcodec.h"
-#include "qtextcodecplugin.h"
+#include "qabstractanimation.h"
+#include "qanimationgroup.h"
+#include "qparallelanimationgroup.h"
+#include "qpauseanimation.h"
+#include "qpropertyanimation.h"
+#include "qsequentialanimationgroup.h"
+#include "qvariantanimation.h"
+#include "qabstracteventdispatcher.h"
+#include "qabstractitemmodel.h"
+#include "qbasictimer.h"
+#include "qcoreapplication.h"
+#include "qcoreevent.h"
+#include "qeventloop.h"
+#include "qmath.h"
+#include "qmetaobject.h"
+#include "qmetatype.h"
+#include "qmimedata.h"
+#include "qobject.h"
+#include "qobjectcleanuphandler.h"
+#include "qobjectdefs.h"
+#include "qpointer.h"
+#include "qsharedmemory.h"
+#include "qsignalmapper.h"
+#include "qsocketnotifier.h"
+#include "qsystemsemaphore.h"
+#include "qtimer.h"
+#include "qtranslator.h"
+#include "qvariant.h"
+#include "qendian.h"
+#include "qfeatures.h"
+#include "qglobal.h"
+#include "qlibraryinfo.h"
+#include "qnamespace.h"
+#include "qnumeric.h"
+#include "qatomic.h"
+#include "qbasicatomic.h"
+#include "qmutex.h"
+#include "qreadwritelock.h"
+#include "qsemaphore.h"
+#include "qthread.h"
+#include "qthreadstorage.h"
+#include "qwaitcondition.h"
+#include "qfactoryinterface.h"
+#include "qlibrary.h"
+#include "qplugin.h"
+#include "qpluginloader.h"
+#include "quuid.h"
 #include "qalgorithms.h"
 #include "qbitarray.h"
@@ -32,4 +59,5 @@
 #include "qdatetime.h"
 #include "qeasingcurve.h"
+#include "qelapsedtimer.h"
 #include "qhash.h"
 #include "qiterator.h"
@@ -59,31 +87,32 @@
 #include "qvarlengtharray.h"
 #include "qvector.h"
-#include "qendian.h"
-#include "qfeatures.h"
-#include "qglobal.h"
-#include "qlibraryinfo.h"
-#include "qnamespace.h"
-#include "qnumeric.h"
-#include "qabstracteventdispatcher.h"
-#include "qabstractitemmodel.h"
-#include "qbasictimer.h"
-#include "qcoreapplication.h"
-#include "qcoreevent.h"
-#include "qeventloop.h"
-#include "qmath.h"
-#include "qmetaobject.h"
-#include "qmetatype.h"
-#include "qmimedata.h"
-#include "qobject.h"
-#include "qobjectcleanuphandler.h"
-#include "qobjectdefs.h"
-#include "qpointer.h"
-#include "qsharedmemory.h"
-#include "qsignalmapper.h"
-#include "qsocketnotifier.h"
-#include "qsystemsemaphore.h"
-#include "qtimer.h"
-#include "qtranslator.h"
-#include "qvariant.h"
+#include "qxmlstream.h"
+#include "qabstractstate.h"
+#include "qabstracttransition.h"
+#include "qeventtransition.h"
+#include "qfinalstate.h"
+#include "qhistorystate.h"
+#include "qsignaltransition.h"
+#include "qstate.h"
+#include "qstatemachine.h"
+#include "qtextcodec.h"
+#include "qtextcodecplugin.h"
+#include "qabstractfileengine.h"
+#include "qbuffer.h"
+#include "qdatastream.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qdiriterator.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qfilesystemwatcher.h"
+#include "qfsfileengine.h"
+#include "qiodevice.h"
+#include "qprocess.h"
+#include "qresource.h"
+#include "qsettings.h"
+#include "qtemporaryfile.h"
+#include "qtextstream.h"
+#include "qurl.h"
 #include "qfuture.h"
 #include "qfutureinterface.h"
@@ -107,31 +136,3 @@
 #include "qtconcurrentthreadengine.h"
 #include "qthreadpool.h"
-#include "qfactoryinterface.h"
-#include "qlibrary.h"
-#include "qplugin.h"
-#include "qpluginloader.h"
-#include "quuid.h"
-#include "qatomic.h"
-#include "qbasicatomic.h"
-#include "qmutex.h"
-#include "qreadwritelock.h"
-#include "qsemaphore.h"
-#include "qthread.h"
-#include "qthreadstorage.h"
-#include "qwaitcondition.h"
-#include "qabstractstate.h"
-#include "qabstracttransition.h"
-#include "qeventtransition.h"
-#include "qfinalstate.h"
-#include "qhistorystate.h"
-#include "qsignaltransition.h"
-#include "qstate.h"
-#include "qstatemachine.h"
-#include "qabstractanimation.h"
-#include "qanimationgroup.h"
-#include "qparallelanimationgroup.h"
-#include "qpauseanimation.h"
-#include "qpropertyanimation.h"
-#include "qsequentialanimationgroup.h"
-#include "qvariantanimation.h"
 #endif
Index: trunk/include/QtCore/headers.pri
===================================================================
--- trunk/include/QtCore/headers.pri	(revision 769)
+++ trunk/include/QtCore/headers.pri	(revision 846)
@@ -1,4 +1,3 @@
-SYNCQT.HEADER_FILES = ../corelib/xml/qxmlstream.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qt_os2.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../../include/QtCore/QtCore 
-SYNCQT.HEADER_CLASSES = ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation 
-SYNCQT.PRIVATE_HEADER_FILES = ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qwindowspipewriter_p.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qguard_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h 
-
+SYNCQT.HEADER_FILES = ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h  ../corelib/global/qt_os2.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../corelib/xml/qxmlstream.h ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../../include/QtCore/QtCore 
+SYNCQT.HEADER_CLASSES = ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QtConfig ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QElapsedTimer ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool 
+SYNCQT.PRIVATE_HEADER_FILES = ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/plugin/qsystemlibrary_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qsimd_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qdataurl_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qwindowspipewriter_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/arch/symbian/common_p.h ../corelib/arch/symbian/dla_p.h ../corelib/arch/symbian/heap_hybrid_p.h ../corelib/arch/symbian/page_alloc_p.h ../corelib/arch/symbian/qt_hybridheap_symbian_p.h ../corelib/arch/symbian/slab_p.h 
Index: trunk/include/QtCore/private/common_p.h
===================================================================
--- trunk/include/QtCore/private/common_p.h	(revision 846)
+++ trunk/include/QtCore/private/common_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/arch/symbian/common_p.h"
Index: trunk/include/QtCore/private/dla_p.h
===================================================================
--- trunk/include/QtCore/private/dla_p.h	(revision 846)
+++ trunk/include/QtCore/private/dla_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/arch/symbian/dla_p.h"
Index: trunk/include/QtCore/private/heap_hybrid_p.h
===================================================================
--- trunk/include/QtCore/private/heap_hybrid_p.h	(revision 846)
+++ trunk/include/QtCore/private/heap_hybrid_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/arch/symbian/heap_hybrid_p.h"
Index: trunk/include/QtCore/private/page_alloc_p.h
===================================================================
--- trunk/include/QtCore/private/page_alloc_p.h	(revision 846)
+++ trunk/include/QtCore/private/page_alloc_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/arch/symbian/page_alloc_p.h"
Index: trunk/include/QtCore/private/qdataurl_p.h
===================================================================
--- trunk/include/QtCore/private/qdataurl_p.h	(revision 846)
+++ trunk/include/QtCore/private/qdataurl_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/io/qdataurl_p.h"
Index: trunk/include/QtCore/private/qguard_p.h
===================================================================
--- trunk/include/QtCore/private/qguard_p.h	(revision 769)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include "../../../src/corelib/kernel/qguard_p.h"
Index: trunk/include/QtCore/private/qsimd_p.h
===================================================================
--- trunk/include/QtCore/private/qsimd_p.h	(revision 846)
+++ trunk/include/QtCore/private/qsimd_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/tools/qsimd_p.h"
Index: trunk/include/QtCore/private/qsystemlibrary_p.h
===================================================================
--- trunk/include/QtCore/private/qsystemlibrary_p.h	(revision 846)
+++ trunk/include/QtCore/private/qsystemlibrary_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/plugin/qsystemlibrary_p.h"
Index: trunk/include/QtCore/private/qt_hybridheap_symbian_p.h
===================================================================
--- trunk/include/QtCore/private/qt_hybridheap_symbian_p.h	(revision 846)
+++ trunk/include/QtCore/private/qt_hybridheap_symbian_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/arch/symbian/qt_hybridheap_symbian_p.h"
Index: trunk/include/QtCore/private/slab_p.h
===================================================================
--- trunk/include/QtCore/private/slab_p.h	(revision 846)
+++ trunk/include/QtCore/private/slab_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/corelib/arch/symbian/slab_p.h"
Index: trunk/include/QtCore/qelapsedtimer.h
===================================================================
--- trunk/include/QtCore/qelapsedtimer.h	(revision 846)
+++ trunk/include/QtCore/qelapsedtimer.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/corelib/tools/qelapsedtimer.h"
Index: trunk/include/QtDeclarative/QDeclarativeAttachedPropertiesFunc
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeAttachedPropertiesFunc	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeAttachedPropertiesFunc	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeprivate.h"
Index: trunk/include/QtDeclarative/QDeclarativeComponent
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeComponent	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeComponent	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativecomponent.h"
Index: trunk/include/QtDeclarative/QDeclarativeContext
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeContext	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeContext	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativecontext.h"
Index: trunk/include/QtDeclarative/QDeclarativeEngine
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeEngine	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeEngine	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeengine.h"
Index: trunk/include/QtDeclarative/QDeclarativeError
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeError	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeError	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeerror.h"
Index: trunk/include/QtDeclarative/QDeclarativeExpression
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeExpression	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeExpression	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeexpression.h"
Index: trunk/include/QtDeclarative/QDeclarativeExtensionInterface
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeExtensionInterface	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeExtensionInterface	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeextensioninterface.h"
Index: trunk/include/QtDeclarative/QDeclarativeExtensionPlugin
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeExtensionPlugin	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeExtensionPlugin	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeextensionplugin.h"
Index: trunk/include/QtDeclarative/QDeclarativeImageProvider
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeImageProvider	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeImageProvider	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeimageprovider.h"
Index: trunk/include/QtDeclarative/QDeclarativeInfo
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeInfo	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeInfo	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeinfo.h"
Index: trunk/include/QtDeclarative/QDeclarativeItem
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeItem	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeItem	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeitem.h"
Index: trunk/include/QtDeclarative/QDeclarativeListProperty
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeListProperty	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeListProperty	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativelist.h"
Index: trunk/include/QtDeclarative/QDeclarativeListReference
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeListReference	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeListReference	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativelist.h"
Index: trunk/include/QtDeclarative/QDeclarativeNetworkAccessManagerFactory
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeNetworkAccessManagerFactory	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeNetworkAccessManagerFactory	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativenetworkaccessmanagerfactory.h"
Index: trunk/include/QtDeclarative/QDeclarativeParserStatus
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeParserStatus	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeParserStatus	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeparserstatus.h"
Index: trunk/include/QtDeclarative/QDeclarativeProperties
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeProperties	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeProperties	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeproperty.h"
Index: trunk/include/QtDeclarative/QDeclarativeProperty
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeProperty	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeProperty	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeproperty.h"
Index: trunk/include/QtDeclarative/QDeclarativePropertyMap
===================================================================
--- trunk/include/QtDeclarative/QDeclarativePropertyMap	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativePropertyMap	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativepropertymap.h"
Index: trunk/include/QtDeclarative/QDeclarativePropertyValueInterceptor
===================================================================
--- trunk/include/QtDeclarative/QDeclarativePropertyValueInterceptor	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativePropertyValueInterceptor	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativepropertyvalueinterceptor.h"
Index: trunk/include/QtDeclarative/QDeclarativePropertyValueSource
===================================================================
--- trunk/include/QtDeclarative/QDeclarativePropertyValueSource	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativePropertyValueSource	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativepropertyvaluesource.h"
Index: trunk/include/QtDeclarative/QDeclarativeScriptString
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeScriptString	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeScriptString	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativescriptstring.h"
Index: trunk/include/QtDeclarative/QDeclarativeTypeInfo
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeTypeInfo	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeTypeInfo	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeprivate.h"
Index: trunk/include/QtDeclarative/QDeclarativeView
===================================================================
--- trunk/include/QtDeclarative/QDeclarativeView	(revision 846)
+++ trunk/include/QtDeclarative/QDeclarativeView	(revision 846)
@@ -0,0 +1,1 @@
+#include "qdeclarativeview.h"
Index: trunk/include/QtDeclarative/QtDeclarative
===================================================================
--- trunk/include/QtDeclarative/QtDeclarative	(revision 769)
+++ trunk/include/QtDeclarative/QtDeclarative	(revision 846)
@@ -1,3 +1,28 @@
 #ifndef QT_QTDECLARATIVE_MODULE_H
 #define QT_QTDECLARATIVE_MODULE_H
+#include <QtCore/QtCore>
+#include <QtGui/QtGui>
+#include <QtScript/QtScript>
+#include <QtNetwork/QtNetwork>
+#include "qdeclarative.h"
+#include "qdeclarativecomponent.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativeerror.h"
+#include "qdeclarativeexpression.h"
+#include "qdeclarativeextensioninterface.h"
+#include "qdeclarativeextensionplugin.h"
+#include "qdeclarativeimageprovider.h"
+#include "qdeclarativeinfo.h"
+#include "qdeclarativelist.h"
+#include "qdeclarativenetworkaccessmanagerfactory.h"
+#include "qdeclarativeparserstatus.h"
+#include "qdeclarativeprivate.h"
+#include "qdeclarativeproperty.h"
+#include "qdeclarativepropertyvalueinterceptor.h"
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativescriptstring.h"
+#include "qdeclarativeitem.h"
+#include "qdeclarativepropertymap.h"
+#include "qdeclarativeview.h"
 #endif
Index: trunk/include/QtDeclarative/headers.pri
===================================================================
--- trunk/include/QtDeclarative/headers.pri	(revision 769)
+++ trunk/include/QtDeclarative/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../../include/QtDeclarative/QtDeclarative 
-SYNCQT.HEADER_CLASSES = 
-SYNCQT.PRIVATE_HEADER_FILES = 
+SYNCQT.HEADER_FILES = ../declarative/qml/qdeclarative.h ../declarative/qml/qdeclarativecomponent.h ../declarative/qml/qdeclarativecontext.h ../declarative/qml/qdeclarativeengine.h ../declarative/qml/qdeclarativeerror.h ../declarative/qml/qdeclarativeexpression.h ../declarative/qml/qdeclarativeextensioninterface.h ../declarative/qml/qdeclarativeextensionplugin.h ../declarative/qml/qdeclarativeimageprovider.h ../declarative/qml/qdeclarativeinfo.h ../declarative/qml/qdeclarativelist.h ../declarative/qml/qdeclarativenetworkaccessmanagerfactory.h ../declarative/qml/qdeclarativeparserstatus.h ../declarative/qml/qdeclarativeprivate.h ../declarative/qml/qdeclarativeproperty.h ../declarative/qml/qdeclarativepropertyvalueinterceptor.h ../declarative/qml/qdeclarativepropertyvaluesource.h ../declarative/qml/qdeclarativescriptstring.h ../declarative/graphicsitems/qdeclarativeitem.h ../declarative/util/qdeclarativepropertymap.h ../declarative/util/qdeclarativeview.h ../../include/QtDeclarative/QtDeclarative 
+SYNCQT.HEADER_CLASSES = ../../include/QtDeclarative/QDeclarativeComponent ../../include/QtDeclarative/QDeclarativeContext ../../include/QtDeclarative/QDeclarativeEngine ../../include/QtDeclarative/QDeclarativeError ../../include/QtDeclarative/QDeclarativeExpression ../../include/QtDeclarative/QDeclarativeExtensionInterface ../../include/QtDeclarative/QDeclarativeExtensionPlugin ../../include/QtDeclarative/QDeclarativeImageProvider ../../include/QtDeclarative/QDeclarativeInfo ../../include/QtDeclarative/QDeclarativeListProperty ../../include/QtDeclarative/QDeclarativeListReference ../../include/QtDeclarative/QDeclarativeNetworkAccessManagerFactory ../../include/QtDeclarative/QDeclarativeParserStatus ../../include/QtDeclarative/QDeclarativeAttachedPropertiesFunc ../../include/QtDeclarative/QDeclarativeTypeInfo ../../include/QtDeclarative/QDeclarativeProperty ../../include/QtDeclarative/QDeclarativeProperties ../../include/QtDeclarative/QDeclarativePropertyValueInterceptor ../../include/QtDeclarative/QDeclarativePropertyValueSource ../../include/QtDeclarative/QDeclarativeScriptString ../../include/QtDeclarative/QDeclarativeItem ../../include/QtDeclarative/QDeclarativePropertyMap ../../include/QtDeclarative/QDeclarativeView 
+SYNCQT.PRIVATE_HEADER_FILES = ../declarative/qml/qbitfield_p.h ../declarative/qml/qdeclarativebinding_p.h ../declarative/qml/qdeclarativebinding_p_p.h ../declarative/qml/qdeclarativeboundsignal_p.h ../declarative/qml/qdeclarativecleanup_p.h ../declarative/qml/qdeclarativecompiledbindings_p.h ../declarative/qml/qdeclarativecompiler_p.h ../declarative/qml/qdeclarativecomponent_p.h ../declarative/qml/qdeclarativecontext_p.h ../declarative/qml/qdeclarativecontextscriptclass_p.h ../declarative/qml/qdeclarativecustomparser_p.h ../declarative/qml/qdeclarativecustomparser_p_p.h ../declarative/qml/qdeclarativedata_p.h ../declarative/qml/qdeclarativedirparser_p.h ../declarative/qml/qdeclarativedom_p.h ../declarative/qml/qdeclarativedom_p_p.h ../declarative/qml/qdeclarativeengine_p.h ../declarative/qml/qdeclarativeenginedebug_p.h ../declarative/qml/qdeclarativeexpression_p.h ../declarative/qml/qdeclarativefastproperties_p.h ../declarative/qml/qdeclarativeglobal_p.h ../declarative/qml/qdeclarativeglobalscriptclass_p.h ../declarative/qml/qdeclarativeguard_p.h ../declarative/qml/qdeclarativeimport_p.h ../declarative/qml/qdeclarativeinclude_p.h ../declarative/qml/qdeclarativeinstruction_p.h ../declarative/qml/qdeclarativeintegercache_p.h ../declarative/qml/qdeclarativelist_p.h ../declarative/qml/qdeclarativelistscriptclass_p.h ../declarative/qml/qdeclarativemetatype_p.h ../declarative/qml/qdeclarativenotifier_p.h ../declarative/qml/qdeclarativeobjectscriptclass_p.h ../declarative/qml/qdeclarativeparser_p.h ../declarative/qml/qdeclarativeproperty_p.h ../declarative/qml/qdeclarativepropertycache_p.h ../declarative/qml/qdeclarativeproxymetaobject_p.h ../declarative/qml/qdeclarativerefcount_p.h ../declarative/qml/qdeclarativerewrite_p.h ../declarative/qml/qdeclarativescriptparser_p.h ../declarative/qml/qdeclarativesqldatabase_p.h ../declarative/qml/qdeclarativestringconverters_p.h ../declarative/qml/qdeclarativetypeloader_p.h ../declarative/qml/qdeclarativetypenamecache_p.h ../declarative/qml/qdeclarativetypenamescriptclass_p.h ../declarative/qml/qdeclarativetypenotavailable_p.h ../declarative/qml/qdeclarativevaluetype_p.h ../declarative/qml/qdeclarativevaluetypescriptclass_p.h ../declarative/qml/qdeclarativevme_p.h ../declarative/qml/qdeclarativevmemetaobject_p.h ../declarative/qml/qdeclarativewatcher_p.h ../declarative/qml/qdeclarativeworkerscript_p.h ../declarative/qml/qdeclarativexmlhttprequest_p.h ../declarative/qml/qmetaobjectbuilder_p.h ../declarative/qml/qpodvector_p.h ../declarative/graphicsitems/qdeclarativeanchors_p.h ../declarative/graphicsitems/qdeclarativeanchors_p_p.h ../declarative/graphicsitems/qdeclarativeanimatedimage_p.h ../declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h ../declarative/graphicsitems/qdeclarativeborderimage_p.h ../declarative/graphicsitems/qdeclarativeborderimage_p_p.h ../declarative/graphicsitems/qdeclarativeevents_p_p.h ../declarative/graphicsitems/qdeclarativeflickable_p.h ../declarative/graphicsitems/qdeclarativeflickable_p_p.h ../declarative/graphicsitems/qdeclarativeflipable_p.h ../declarative/graphicsitems/qdeclarativefocuspanel_p.h ../declarative/graphicsitems/qdeclarativefocusscope_p.h ../declarative/graphicsitems/qdeclarativegraphicswidget_p.h ../declarative/graphicsitems/qdeclarativegridview_p.h ../declarative/graphicsitems/qdeclarativeimage_p.h ../declarative/graphicsitems/qdeclarativeimage_p_p.h ../declarative/graphicsitems/qdeclarativeimagebase_p.h ../declarative/graphicsitems/qdeclarativeimagebase_p_p.h ../declarative/graphicsitems/qdeclarativeitem_p.h ../declarative/graphicsitems/qdeclarativeitemchangelistener_p.h ../declarative/graphicsitems/qdeclarativeitemsmodule_p.h ../declarative/graphicsitems/qdeclarativelayoutitem_p.h ../declarative/graphicsitems/qdeclarativelistview_p.h ../declarative/graphicsitems/qdeclarativeloader_p.h ../declarative/graphicsitems/qdeclarativeloader_p_p.h ../declarative/graphicsitems/qdeclarativemousearea_p.h ../declarative/graphicsitems/qdeclarativemousearea_p_p.h ../declarative/graphicsitems/qdeclarativepainteditem_p.h ../declarative/graphicsitems/qdeclarativepainteditem_p_p.h ../declarative/graphicsitems/qdeclarativepath_p.h ../declarative/graphicsitems/qdeclarativepath_p_p.h ../declarative/graphicsitems/qdeclarativepathview_p.h ../declarative/graphicsitems/qdeclarativepathview_p_p.h ../declarative/graphicsitems/qdeclarativepositioners_p.h ../declarative/graphicsitems/qdeclarativepositioners_p_p.h ../declarative/graphicsitems/qdeclarativerectangle_p.h ../declarative/graphicsitems/qdeclarativerectangle_p_p.h ../declarative/graphicsitems/qdeclarativerepeater_p.h ../declarative/graphicsitems/qdeclarativerepeater_p_p.h ../declarative/graphicsitems/qdeclarativescalegrid_p_p.h ../declarative/graphicsitems/qdeclarativetext_p.h ../declarative/graphicsitems/qdeclarativetext_p_p.h ../declarative/graphicsitems/qdeclarativetextedit_p.h ../declarative/graphicsitems/qdeclarativetextedit_p_p.h ../declarative/graphicsitems/qdeclarativetextinput_p.h ../declarative/graphicsitems/qdeclarativetextinput_p_p.h ../declarative/graphicsitems/qdeclarativetextlayout_p.h ../declarative/graphicsitems/qdeclarativetranslate_p.h ../declarative/graphicsitems/qdeclarativevisualitemmodel_p.h ../declarative/debugger/qdeclarativedebug_p.h ../declarative/debugger/qdeclarativedebugclient_p.h ../declarative/debugger/qdeclarativedebuggerstatus_p.h ../declarative/debugger/qdeclarativedebughelper_p.h ../declarative/debugger/qdeclarativedebugserver_p.h ../declarative/debugger/qdeclarativedebugserverconnection_p.h ../declarative/debugger/qdeclarativedebugservice_p.h ../declarative/debugger/qdeclarativedebugservice_p_p.h ../declarative/debugger/qdeclarativedebugtrace_p.h ../declarative/debugger/qpacketprotocol_p.h ../declarative/util/qdeclarativeanimation_p.h ../declarative/util/qdeclarativeanimation_p_p.h ../declarative/util/qdeclarativebehavior_p.h ../declarative/util/qdeclarativebind_p.h ../declarative/util/qdeclarativeconnections_p.h ../declarative/util/qdeclarativefontloader_p.h ../declarative/util/qdeclarativelistaccessor_p.h ../declarative/util/qdeclarativelistmodel_p.h ../declarative/util/qdeclarativelistmodel_p_p.h ../declarative/util/qdeclarativelistmodelworkeragent_p.h ../declarative/util/qdeclarativenullablevalue_p_p.h ../declarative/util/qdeclarativeopenmetaobject_p.h ../declarative/util/qdeclarativepackage_p.h ../declarative/util/qdeclarativepixmapcache_p.h ../declarative/util/qdeclarativepropertychanges_p.h ../declarative/util/qdeclarativesmoothedanimation_p.h ../declarative/util/qdeclarativesmoothedanimation_p_p.h ../declarative/util/qdeclarativespringanimation_p.h ../declarative/util/qdeclarativestate_p.h ../declarative/util/qdeclarativestate_p_p.h ../declarative/util/qdeclarativestategroup_p.h ../declarative/util/qdeclarativestateoperations_p.h ../declarative/util/qdeclarativestyledtext_p.h ../declarative/util/qdeclarativesystempalette_p.h ../declarative/util/qdeclarativetimeline_p_p.h ../declarative/util/qdeclarativetimer_p.h ../declarative/util/qdeclarativetransition_p.h ../declarative/util/qdeclarativetransitionmanager_p_p.h ../declarative/util/qdeclarativeutilmodule_p.h ../declarative/util/qdeclarativexmllistmodel_p.h ../declarative/util/qlistmodelinterface_p.h ../declarative/qml/parser/qdeclarativejsast_p.h ../declarative/qml/parser/qdeclarativejsastfwd_p.h ../declarative/qml/parser/qdeclarativejsastvisitor_p.h ../declarative/qml/parser/qdeclarativejsengine_p.h ../declarative/qml/parser/qdeclarativejsglobal_p.h ../declarative/qml/parser/qdeclarativejsgrammar_p.h ../declarative/qml/parser/qdeclarativejslexer_p.h ../declarative/qml/parser/qdeclarativejsmemorypool_p.h ../declarative/qml/parser/qdeclarativejsnodepool_p.h ../declarative/qml/parser/qdeclarativejsparser_p.h ../declarative/qml/rewriter/textwriter_p.h 
Index: trunk/include/QtDeclarative/private/qbitfield_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qbitfield_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qbitfield_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qbitfield_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeanchors_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeanchors_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeanchors_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeanchors_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeanchors_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeanchors_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeanchors_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeanchors_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeanimatedimage_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeanimatedimage_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeanimatedimage_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeanimatedimage_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeanimatedimage_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeanimatedimage_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeanimation_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeanimation_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeanimation_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativeanimation_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeanimation_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeanimation_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeanimation_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativeanimation_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativebehavior_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativebehavior_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativebehavior_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativebehavior_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativebind_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativebind_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativebind_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativebind_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativebinding_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativebinding_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativebinding_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativebinding_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativebinding_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativebinding_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativebinding_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativebinding_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeborderimage_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeborderimage_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeborderimage_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeborderimage_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeborderimage_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeborderimage_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeborderimage_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeboundsignal_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeboundsignal_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeboundsignal_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeboundsignal_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecleanup_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecleanup_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecleanup_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecleanup_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecompiledbindings_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecompiledbindings_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecompiledbindings_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecompiledbindings_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecompiler_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecompiler_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecompiler_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecompiler_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecomponent_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecomponent_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecomponent_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecomponent_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeconnections_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeconnections_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeconnections_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativeconnections_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecontext_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecontext_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecontext_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecontext_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecontextscriptclass_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecontextscriptclass_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecontextscriptclass_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecontextscriptclass_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecustomparser_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecustomparser_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecustomparser_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecustomparser_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativecustomparser_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativecustomparser_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativecustomparser_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativecustomparser_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedata_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedata_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedata_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativedata_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebug_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebug_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebug_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebug_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebugclient_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebugclient_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebugclient_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebugclient_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebuggerstatus_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebuggerstatus_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebuggerstatus_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebuggerstatus_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebughelper_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebughelper_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebughelper_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebughelper_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebugserver_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebugserver_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebugserver_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebugserver_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebugserverconnection_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebugserverconnection_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebugserverconnection_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebugserverconnection_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebugservice_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebugservice_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebugservice_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebugservice_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebugservice_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebugservice_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebugservice_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebugservice_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedebugtrace_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedebugtrace_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedebugtrace_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qdeclarativedebugtrace_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedirparser_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedirparser_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedirparser_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativedirparser_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedom_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedom_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedom_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativedom_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativedom_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativedom_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativedom_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativedom_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeengine_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeengine_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeengine_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeengine_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeenginedebug_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeenginedebug_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeenginedebug_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeenginedebug_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeevents_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeevents_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeevents_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeevents_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeexpression_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeexpression_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeexpression_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeexpression_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativefastproperties_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativefastproperties_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativefastproperties_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativefastproperties_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeflickable_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeflickable_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeflickable_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeflickable_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeflickable_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeflickable_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeflickable_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeflickable_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeflipable_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeflipable_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeflipable_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeflipable_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativefocuspanel_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativefocuspanel_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativefocuspanel_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativefocuspanel_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativefocusscope_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativefocusscope_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativefocusscope_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativefocusscope_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativefontloader_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativefontloader_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativefontloader_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativefontloader_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeglobal_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeglobal_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeglobal_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeglobal_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeglobalscriptclass_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeglobalscriptclass_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeglobalscriptclass_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeglobalscriptclass_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativegraphicswidget_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativegraphicswidget_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativegraphicswidget_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativegridview_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativegridview_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativegridview_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativegridview_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeguard_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeguard_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeguard_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeguard_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeimage_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeimage_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeimage_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeimage_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeimage_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeimage_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeimage_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeimage_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeimagebase_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeimagebase_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeimagebase_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeimagebase_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeimagebase_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeimagebase_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeimagebase_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeimport_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeimport_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeimport_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeimport_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeinclude_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeinclude_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeinclude_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeinclude_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeinstruction_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeinstruction_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeinstruction_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeinstruction_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeintegercache_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeintegercache_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeintegercache_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeintegercache_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeitem_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeitem_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeitem_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeitem_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeitemchangelistener_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeitemchangelistener_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeitemchangelistener_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeitemsmodule_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeitemsmodule_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeitemsmodule_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsast_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsast_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsast_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsast_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsastfwd_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsastfwd_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsastfwd_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsastfwd_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsastvisitor_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsastvisitor_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsastvisitor_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsastvisitor_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsengine_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsengine_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsengine_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsengine_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsglobal_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsglobal_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsglobal_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsglobal_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsgrammar_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsgrammar_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsgrammar_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsgrammar_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejslexer_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejslexer_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejslexer_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejslexer_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsmemorypool_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsmemorypool_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsmemorypool_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsmemorypool_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsnodepool_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsnodepool_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsnodepool_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsnodepool_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativejsparser_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativejsparser_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativejsparser_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/parser/qdeclarativejsparser_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelayoutitem_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelayoutitem_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelayoutitem_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativelayoutitem_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelist_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelist_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelist_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativelist_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelistaccessor_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelistaccessor_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelistaccessor_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativelistaccessor_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelistmodel_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelistmodel_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelistmodel_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativelistmodel_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelistmodel_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelistmodel_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelistmodel_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativelistmodel_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelistmodelworkeragent_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelistmodelworkeragent_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelistmodelworkeragent_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativelistmodelworkeragent_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelistscriptclass_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelistscriptclass_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelistscriptclass_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativelistscriptclass_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativelistview_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativelistview_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativelistview_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativelistview_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeloader_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeloader_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeloader_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeloader_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeloader_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeloader_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeloader_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativeloader_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativemetatype_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativemetatype_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativemetatype_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativemetatype_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativemousearea_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativemousearea_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativemousearea_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativemousearea_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativemousearea_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativemousearea_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativemousearea_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativemousearea_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativenotifier_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativenotifier_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativenotifier_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativenotifier_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativenullablevalue_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativenullablevalue_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativenullablevalue_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativenullablevalue_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeobjectscriptclass_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeobjectscriptclass_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeobjectscriptclass_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeobjectscriptclass_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeopenmetaobject_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeopenmetaobject_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeopenmetaobject_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativeopenmetaobject_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepackage_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepackage_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepackage_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativepackage_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepainteditem_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepainteditem_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepainteditem_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepainteditem_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepainteditem_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepainteditem_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepainteditem_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeparser_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeparser_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeparser_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeparser_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepath_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepath_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepath_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepath_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepath_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepath_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepath_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepath_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepathview_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepathview_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepathview_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepathview_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepathview_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepathview_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepathview_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepathview_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepixmapcache_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepixmapcache_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepixmapcache_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativepixmapcache_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepositioners_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepositioners_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepositioners_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepositioners_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepositioners_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepositioners_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepositioners_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativepositioners_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeproperty_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeproperty_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeproperty_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeproperty_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepropertycache_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepropertycache_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepropertycache_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativepropertycache_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativepropertychanges_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativepropertychanges_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativepropertychanges_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativepropertychanges_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeproxymetaobject_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeproxymetaobject_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeproxymetaobject_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeproxymetaobject_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativerectangle_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativerectangle_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativerectangle_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativerectangle_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativerectangle_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativerectangle_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativerectangle_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativerectangle_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativerefcount_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativerefcount_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativerefcount_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativerefcount_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativerepeater_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativerepeater_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativerepeater_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativerepeater_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativerepeater_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativerepeater_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativerepeater_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativerepeater_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativerewrite_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativerewrite_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativerewrite_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativerewrite_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativescalegrid_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativescalegrid_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativescalegrid_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativescriptparser_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativescriptparser_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativescriptparser_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativescriptparser_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativesmoothedanimation_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativesmoothedanimation_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativesmoothedanimation_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativesmoothedanimation_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativesmoothedanimation_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativesmoothedanimation_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativesmoothedanimation_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativesmoothedanimation_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativespringanimation_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativespringanimation_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativespringanimation_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativespringanimation_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativesqldatabase_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativesqldatabase_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativesqldatabase_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativesqldatabase_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativestate_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativestate_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativestate_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativestate_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativestate_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativestate_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativestate_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativestate_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativestategroup_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativestategroup_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativestategroup_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativestategroup_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativestateoperations_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativestateoperations_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativestateoperations_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativestateoperations_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativestringconverters_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativestringconverters_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativestringconverters_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativestringconverters_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativestyledtext_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativestyledtext_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativestyledtext_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativestyledtext_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativesystempalette_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativesystempalette_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativesystempalette_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativesystempalette_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetext_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetext_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetext_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetext_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetext_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetext_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetext_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetext_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetextedit_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetextedit_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetextedit_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetextedit_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetextedit_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetextedit_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetextedit_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetextedit_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetextinput_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetextinput_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetextinput_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetextinput_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetextinput_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetextinput_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetextinput_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetextinput_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetextlayout_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetextlayout_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetextlayout_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetextlayout_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetimeline_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetimeline_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetimeline_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativetimeline_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetimer_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetimer_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetimer_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativetimer_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetransition_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetransition_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetransition_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativetransition_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetransitionmanager_p_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetransitionmanager_p_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetransitionmanager_p_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativetransitionmanager_p_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetranslate_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetranslate_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetranslate_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativetranslate_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetypeloader_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetypeloader_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetypeloader_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativetypeloader_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetypenamecache_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetypenamecache_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetypenamecache_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativetypenamecache_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetypenamescriptclass_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetypenamescriptclass_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetypenamescriptclass_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativetypenamescriptclass_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativetypenotavailable_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativetypenotavailable_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativetypenotavailable_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativetypenotavailable_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeutilmodule_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeutilmodule_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeutilmodule_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativeutilmodule_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativevaluetype_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativevaluetype_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativevaluetype_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativevaluetype_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativevaluetypescriptclass_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativevaluetypescriptclass_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativevaluetypescriptclass_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativevaluetypescriptclass_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativevisualitemmodel_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativevisualitemmodel_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativevisualitemmodel_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativevme_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativevme_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativevme_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativevme_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativevmemetaobject_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativevmemetaobject_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativevmemetaobject_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativevmemetaobject_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativewatcher_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativewatcher_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativewatcher_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativewatcher_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativeworkerscript_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativeworkerscript_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativeworkerscript_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativeworkerscript_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativexmlhttprequest_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativexmlhttprequest_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativexmlhttprequest_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qdeclarativexmlhttprequest_p.h"
Index: trunk/include/QtDeclarative/private/qdeclarativexmllistmodel_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qdeclarativexmllistmodel_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qdeclarativexmllistmodel_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qdeclarativexmllistmodel_p.h"
Index: trunk/include/QtDeclarative/private/qlistmodelinterface_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qlistmodelinterface_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qlistmodelinterface_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/util/qlistmodelinterface_p.h"
Index: trunk/include/QtDeclarative/private/qmetaobjectbuilder_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qmetaobjectbuilder_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qmetaobjectbuilder_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qmetaobjectbuilder_p.h"
Index: trunk/include/QtDeclarative/private/qpacketprotocol_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qpacketprotocol_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qpacketprotocol_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/debugger/qpacketprotocol_p.h"
Index: trunk/include/QtDeclarative/private/qpodvector_p.h
===================================================================
--- trunk/include/QtDeclarative/private/qpodvector_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/qpodvector_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/qpodvector_p.h"
Index: trunk/include/QtDeclarative/private/textwriter_p.h
===================================================================
--- trunk/include/QtDeclarative/private/textwriter_p.h	(revision 846)
+++ trunk/include/QtDeclarative/private/textwriter_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/declarative/qml/rewriter/textwriter_p.h"
Index: trunk/include/QtDeclarative/qdeclarative.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarative.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarative.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarative.h"
Index: trunk/include/QtDeclarative/qdeclarativecomponent.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativecomponent.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativecomponent.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativecomponent.h"
Index: trunk/include/QtDeclarative/qdeclarativecontext.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativecontext.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativecontext.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativecontext.h"
Index: trunk/include/QtDeclarative/qdeclarativeengine.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeengine.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeengine.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeengine.h"
Index: trunk/include/QtDeclarative/qdeclarativeerror.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeerror.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeerror.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeerror.h"
Index: trunk/include/QtDeclarative/qdeclarativeexpression.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeexpression.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeexpression.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeexpression.h"
Index: trunk/include/QtDeclarative/qdeclarativeextensioninterface.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeextensioninterface.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeextensioninterface.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeextensioninterface.h"
Index: trunk/include/QtDeclarative/qdeclarativeextensionplugin.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeextensionplugin.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeextensionplugin.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeextensionplugin.h"
Index: trunk/include/QtDeclarative/qdeclarativeimageprovider.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeimageprovider.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeimageprovider.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeimageprovider.h"
Index: trunk/include/QtDeclarative/qdeclarativeinfo.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeinfo.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeinfo.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeinfo.h"
Index: trunk/include/QtDeclarative/qdeclarativeitem.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeitem.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeitem.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/graphicsitems/qdeclarativeitem.h"
Index: trunk/include/QtDeclarative/qdeclarativelist.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativelist.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativelist.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativelist.h"
Index: trunk/include/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h"
Index: trunk/include/QtDeclarative/qdeclarativeparserstatus.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeparserstatus.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeparserstatus.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeparserstatus.h"
Index: trunk/include/QtDeclarative/qdeclarativeprivate.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeprivate.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeprivate.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeprivate.h"
Index: trunk/include/QtDeclarative/qdeclarativeproperty.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeproperty.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeproperty.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativeproperty.h"
Index: trunk/include/QtDeclarative/qdeclarativepropertymap.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativepropertymap.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativepropertymap.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/util/qdeclarativepropertymap.h"
Index: trunk/include/QtDeclarative/qdeclarativepropertyvalueinterceptor.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativepropertyvalueinterceptor.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativepropertyvalueinterceptor.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativepropertyvalueinterceptor.h"
Index: trunk/include/QtDeclarative/qdeclarativepropertyvaluesource.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativepropertyvaluesource.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativepropertyvaluesource.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativepropertyvaluesource.h"
Index: trunk/include/QtDeclarative/qdeclarativescriptstring.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativescriptstring.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativescriptstring.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/qml/qdeclarativescriptstring.h"
Index: trunk/include/QtDeclarative/qdeclarativeview.h
===================================================================
--- trunk/include/QtDeclarative/qdeclarativeview.h	(revision 846)
+++ trunk/include/QtDeclarative/qdeclarativeview.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/declarative/util/qdeclarativeview.h"
Index: trunk/include/QtDesigner/QtDesigner
===================================================================
--- trunk/include/QtDesigner/QtDesigner	(revision 769)
+++ trunk/include/QtDesigner/QtDesigner	(revision 846)
@@ -2,6 +2,4 @@
 #define QT_QTDESIGNER_MODULE_H
 #include <QtXml/QtXml>
-#include "extension.h"
-#include "qextensionmanager.h"
 #include "abstractactioneditor.h"
 #include "abstractbrushmanager.h"
@@ -30,4 +28,6 @@
 #include "propertysheet.h"
 #include "taskmenu.h"
+#include "extension.h"
+#include "qextensionmanager.h"
 #include "abstractformbuilder.h"
 #include "container.h"
Index: trunk/include/QtDesigner/headers.pri
===================================================================
--- trunk/include/QtDesigner/headers.pri	(revision 769)
+++ trunk/include/QtDesigner/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../lib/components/qdesigner_components.h ../lib/components/qdesigner_components_global.h ../lib/extension/default_extensionfactory.h ../lib/extension/extension.h ../lib/extension/extension_global.h ../lib/extension/qextensionmanager.h ../lib/sdk/abstractactioneditor.h ../lib/sdk/abstractbrushmanager.h ../lib/sdk/abstractdnditem.h ../lib/sdk/abstractformeditor.h ../lib/sdk/abstractformeditorplugin.h ../lib/sdk/abstractformwindow.h ../lib/sdk/abstractformwindowcursor.h ../lib/sdk/abstractformwindowmanager.h ../lib/sdk/abstractformwindowtool.h ../lib/sdk/abstracticoncache.h ../lib/sdk/abstractintegration.h ../lib/sdk/abstractlanguage.h ../lib/sdk/abstractmetadatabase.h ../lib/sdk/abstractobjectinspector.h ../lib/sdk/abstractpromotioninterface.h ../lib/sdk/abstractpropertyeditor.h ../lib/sdk/abstractresourcebrowser.h ../lib/sdk/abstractwidgetbox.h ../lib/sdk/abstractwidgetdatabase.h ../lib/sdk/abstractwidgetfactory.h ../lib/sdk/dynamicpropertysheet.h ../lib/sdk/extrainfo.h ../lib/sdk/layoutdecoration.h ../lib/sdk/membersheet.h ../lib/sdk/propertysheet.h ../lib/sdk/sdk_global.h ../lib/sdk/taskmenu.h ../lib/uilib/abstractformbuilder.h ../lib/uilib/container.h ../lib/uilib/customwidget.h ../lib/uilib/formbuilder.h ../lib/uilib/qdesignerexportwidget.h ../lib/uilib/uilib_global.h ../../../../include/QtDesigner/QtDesigner 
-SYNCQT.HEADER_CLASSES = ../../../../include/QtDesigner/QDesignerComponents ../../../../include/QtDesigner/QExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionManager ../../../../include/QtDesigner/QExtensionManager ../../../../include/QtDesigner/QDesignerActionEditorInterface ../../../../include/QtDesigner/QDesignerBrushManagerInterface ../../../../include/QtDesigner/QDesignerDnDItemInterface ../../../../include/QtDesigner/QDesignerFormEditorInterface ../../../../include/QtDesigner/QDesignerFormEditorPluginInterface ../../../../include/QtDesigner/QDesignerFormWindowInterface ../../../../include/QtDesigner/QDesignerFormWindowCursorInterface ../../../../include/QtDesigner/QDesignerFormWindowManagerInterface ../../../../include/QtDesigner/QDesignerFormWindowToolInterface ../../../../include/QtDesigner/QDesignerIconCacheInterface ../../../../include/QtDesigner/QDesignerIntegrationInterface ../../../../include/QtDesigner/QDesignerLanguageExtension ../../../../include/QtDesigner/QDesignerMetaDataBaseItemInterface ../../../../include/QtDesigner/QDesignerMetaDataBaseInterface ../../../../include/QtDesigner/QDesignerObjectInspectorInterface ../../../../include/QtDesigner/QDesignerPromotionInterface ../../../../include/QtDesigner/QDesignerPropertyEditorInterface ../../../../include/QtDesigner/QDesignerResourceBrowserInterface ../../../../include/QtDesigner/QDesignerWidgetBoxInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseItemInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseInterface ../../../../include/QtDesigner/QDesignerWidgetFactoryInterface ../../../../include/QtDesigner/QDesignerDynamicPropertySheetExtension ../../../../include/QtDesigner/QDesignerExtraInfoExtension ../../../../include/QtDesigner/QDesignerLayoutDecorationExtension ../../../../include/QtDesigner/QDesignerMemberSheetExtension ../../../../include/QtDesigner/QDesignerPropertySheetExtension ../../../../include/QtDesigner/QDesignerTaskMenuExtension ../../../../include/QtDesigner/QAbstractFormBuilder ../../../../include/QtDesigner/QDesignerContainerExtension ../../../../include/QtDesigner/QDesignerCustomWidgetInterface ../../../../include/QtDesigner/QDesignerCustomWidgetCollectionInterface ../../../../include/QtDesigner/QFormBuilder ../../../../include/QtDesigner/QDesignerExportWidget 
-SYNCQT.PRIVATE_HEADER_FILES = lib_pch.h ../lib/shared/actioneditor_p.h ../lib/shared/actionprovider_p.h ../lib/shared/actionrepository_p.h ../lib/shared/codedialog_p.h ../lib/shared/connectionedit_p.h ../lib/shared/csshighlighter_p.h ../lib/shared/deviceprofile_p.h ../lib/shared/dialoggui_p.h ../lib/shared/extensionfactory_p.h ../lib/shared/filterwidget_p.h ../lib/shared/formlayoutmenu_p.h ../lib/shared/formwindowbase_p.h ../lib/shared/grid_p.h ../lib/shared/gridpanel_p.h ../lib/shared/htmlhighlighter_p.h ../lib/shared/iconloader_p.h ../lib/shared/iconselector_p.h ../lib/shared/invisible_widget_p.h ../lib/shared/layout_p.h ../lib/shared/layoutinfo_p.h ../lib/shared/metadatabase_p.h ../lib/shared/morphmenu_p.h ../lib/shared/newactiondialog_p.h ../lib/shared/newformwidget_p.h ../lib/shared/orderdialog_p.h ../lib/shared/plaintexteditor_p.h ../lib/shared/plugindialog_p.h ../lib/shared/pluginmanager_p.h ../lib/shared/previewconfigurationwidget_p.h ../lib/shared/previewmanager_p.h ../lib/shared/promotionmodel_p.h ../lib/shared/promotiontaskmenu_p.h ../lib/shared/propertylineedit_p.h ../lib/shared/qdesigner_command2_p.h ../lib/shared/qdesigner_command_p.h ../lib/shared/qdesigner_dnditem_p.h ../lib/shared/qdesigner_dockwidget_p.h ../lib/shared/qdesigner_formbuilder_p.h ../lib/shared/qdesigner_formeditorcommand_p.h ../lib/shared/qdesigner_formwindowcommand_p.h ../lib/shared/qdesigner_formwindowmanager_p.h ../lib/shared/qdesigner_integration_p.h ../lib/shared/qdesigner_introspection_p.h ../lib/shared/qdesigner_membersheet_p.h ../lib/shared/qdesigner_menu_p.h ../lib/shared/qdesigner_menubar_p.h ../lib/shared/qdesigner_objectinspector_p.h ../lib/shared/qdesigner_promotion_p.h ../lib/shared/qdesigner_promotiondialog_p.h ../lib/shared/qdesigner_propertycommand_p.h ../lib/shared/qdesigner_propertyeditor_p.h ../lib/shared/qdesigner_propertysheet_p.h ../lib/shared/qdesigner_qsettings_p.h ../lib/shared/qdesigner_stackedbox_p.h ../lib/shared/qdesigner_tabwidget_p.h ../lib/shared/qdesigner_taskmenu_p.h ../lib/shared/qdesigner_toolbar_p.h ../lib/shared/qdesigner_toolbox_p.h ../lib/shared/qdesigner_utils_p.h ../lib/shared/qdesigner_widget_p.h ../lib/shared/qdesigner_widgetbox_p.h ../lib/shared/qdesigner_widgetitem_p.h ../lib/shared/qlayout_widget_p.h ../lib/shared/qscripthighlighter_p.h ../lib/shared/qsimpleresource_p.h ../lib/shared/qtresourceeditordialog_p.h ../lib/shared/qtresourcemodel_p.h ../lib/shared/qtresourceview_p.h ../lib/shared/richtexteditor_p.h ../lib/shared/scriptcommand_p.h ../lib/shared/scriptdialog_p.h ../lib/shared/scripterrordialog_p.h ../lib/shared/shared_enums_p.h ../lib/shared/shared_global_p.h ../lib/shared/shared_settings_p.h ../lib/shared/sheet_delegate_p.h ../lib/shared/signalslotdialog_p.h ../lib/shared/spacer_widget_p.h ../lib/shared/stylesheeteditor_p.h ../lib/shared/textpropertyeditor_p.h ../lib/shared/widgetdatabase_p.h ../lib/shared/widgetfactory_p.h ../lib/shared/zoomwidget_p.h ../lib/sdk/abstractdialoggui_p.h ../lib/sdk/abstractintrospection_p.h ../lib/sdk/abstractnewformwidget_p.h ../lib/sdk/abstractoptionspage_p.h ../lib/sdk/abstractsettings_p.h ../lib/sdk/script_p.h ../lib/uilib/formbuilderextra_p.h ../lib/uilib/formscriptrunner_p.h ../lib/uilib/properties_p.h ../lib/uilib/resourcebuilder_p.h ../lib/uilib/textbuilder_p.h ../lib/uilib/ui4_p.h 
+SYNCQT.HEADER_FILES = ../lib/components/qdesigner_components.h ../lib/components/qdesigner_components_global.h ../lib/sdk/abstractactioneditor.h ../lib/sdk/abstractbrushmanager.h ../lib/sdk/abstractdnditem.h ../lib/sdk/abstractformeditor.h ../lib/sdk/abstractformeditorplugin.h ../lib/sdk/abstractformwindow.h ../lib/sdk/abstractformwindowcursor.h ../lib/sdk/abstractformwindowmanager.h ../lib/sdk/abstractformwindowtool.h ../lib/sdk/abstracticoncache.h ../lib/sdk/abstractintegration.h ../lib/sdk/abstractlanguage.h ../lib/sdk/abstractmetadatabase.h ../lib/sdk/abstractobjectinspector.h ../lib/sdk/abstractpromotioninterface.h ../lib/sdk/abstractpropertyeditor.h ../lib/sdk/abstractresourcebrowser.h ../lib/sdk/abstractwidgetbox.h ../lib/sdk/abstractwidgetdatabase.h ../lib/sdk/abstractwidgetfactory.h ../lib/sdk/dynamicpropertysheet.h ../lib/sdk/extrainfo.h ../lib/sdk/layoutdecoration.h ../lib/sdk/membersheet.h ../lib/sdk/propertysheet.h ../lib/sdk/sdk_global.h ../lib/sdk/taskmenu.h ../lib/extension/default_extensionfactory.h ../lib/extension/extension.h ../lib/extension/extension_global.h ../lib/extension/qextensionmanager.h ../lib/uilib/abstractformbuilder.h ../lib/uilib/container.h ../lib/uilib/customwidget.h ../lib/uilib/formbuilder.h ../lib/uilib/qdesignerexportwidget.h ../lib/uilib/uilib_global.h ../../../../include/QtDesigner/QtDesigner 
+SYNCQT.HEADER_CLASSES = ../../../../include/QtDesigner/QDesignerComponents ../../../../include/QtDesigner/QDesignerActionEditorInterface ../../../../include/QtDesigner/QDesignerBrushManagerInterface ../../../../include/QtDesigner/QDesignerDnDItemInterface ../../../../include/QtDesigner/QDesignerFormEditorInterface ../../../../include/QtDesigner/QDesignerFormEditorPluginInterface ../../../../include/QtDesigner/QDesignerFormWindowInterface ../../../../include/QtDesigner/QDesignerFormWindowCursorInterface ../../../../include/QtDesigner/QDesignerFormWindowManagerInterface ../../../../include/QtDesigner/QDesignerFormWindowToolInterface ../../../../include/QtDesigner/QDesignerIconCacheInterface ../../../../include/QtDesigner/QDesignerIntegrationInterface ../../../../include/QtDesigner/QDesignerLanguageExtension ../../../../include/QtDesigner/QDesignerMetaDataBaseItemInterface ../../../../include/QtDesigner/QDesignerMetaDataBaseInterface ../../../../include/QtDesigner/QDesignerObjectInspectorInterface ../../../../include/QtDesigner/QDesignerPromotionInterface ../../../../include/QtDesigner/QDesignerPropertyEditorInterface ../../../../include/QtDesigner/QDesignerResourceBrowserInterface ../../../../include/QtDesigner/QDesignerWidgetBoxInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseItemInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseInterface ../../../../include/QtDesigner/QDesignerWidgetFactoryInterface ../../../../include/QtDesigner/QDesignerDynamicPropertySheetExtension ../../../../include/QtDesigner/QDesignerExtraInfoExtension ../../../../include/QtDesigner/QDesignerLayoutDecorationExtension ../../../../include/QtDesigner/QDesignerMemberSheetExtension ../../../../include/QtDesigner/QDesignerPropertySheetExtension ../../../../include/QtDesigner/QDesignerTaskMenuExtension ../../../../include/QtDesigner/QExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionManager ../../../../include/QtDesigner/QExtensionManager ../../../../include/QtDesigner/QAbstractFormBuilder ../../../../include/QtDesigner/QDesignerContainerExtension ../../../../include/QtDesigner/QDesignerCustomWidgetInterface ../../../../include/QtDesigner/QDesignerCustomWidgetCollectionInterface ../../../../include/QtDesigner/QFormBuilder ../../../../include/QtDesigner/QDesignerExportWidget 
+SYNCQT.PRIVATE_HEADER_FILES = lib_pch.h ../lib/sdk/abstractdialoggui_p.h ../lib/sdk/abstractintrospection_p.h ../lib/sdk/abstractnewformwidget_p.h ../lib/sdk/abstractoptionspage_p.h ../lib/sdk/abstractsettings_p.h ../lib/sdk/script_p.h ../lib/shared/actioneditor_p.h ../lib/shared/actionprovider_p.h ../lib/shared/actionrepository_p.h ../lib/shared/codedialog_p.h ../lib/shared/connectionedit_p.h ../lib/shared/csshighlighter_p.h ../lib/shared/deviceprofile_p.h ../lib/shared/dialoggui_p.h ../lib/shared/extensionfactory_p.h ../lib/shared/filterwidget_p.h ../lib/shared/formlayoutmenu_p.h ../lib/shared/formwindowbase_p.h ../lib/shared/grid_p.h ../lib/shared/gridpanel_p.h ../lib/shared/htmlhighlighter_p.h ../lib/shared/iconloader_p.h ../lib/shared/iconselector_p.h ../lib/shared/invisible_widget_p.h ../lib/shared/layout_p.h ../lib/shared/layoutinfo_p.h ../lib/shared/metadatabase_p.h ../lib/shared/morphmenu_p.h ../lib/shared/newactiondialog_p.h ../lib/shared/newformwidget_p.h ../lib/shared/orderdialog_p.h ../lib/shared/plaintexteditor_p.h ../lib/shared/plugindialog_p.h ../lib/shared/pluginmanager_p.h ../lib/shared/previewconfigurationwidget_p.h ../lib/shared/previewmanager_p.h ../lib/shared/promotionmodel_p.h ../lib/shared/promotiontaskmenu_p.h ../lib/shared/propertylineedit_p.h ../lib/shared/qdesigner_command2_p.h ../lib/shared/qdesigner_command_p.h ../lib/shared/qdesigner_dnditem_p.h ../lib/shared/qdesigner_dockwidget_p.h ../lib/shared/qdesigner_formbuilder_p.h ../lib/shared/qdesigner_formeditorcommand_p.h ../lib/shared/qdesigner_formwindowcommand_p.h ../lib/shared/qdesigner_formwindowmanager_p.h ../lib/shared/qdesigner_integration_p.h ../lib/shared/qdesigner_introspection_p.h ../lib/shared/qdesigner_membersheet_p.h ../lib/shared/qdesigner_menu_p.h ../lib/shared/qdesigner_menubar_p.h ../lib/shared/qdesigner_objectinspector_p.h ../lib/shared/qdesigner_promotion_p.h ../lib/shared/qdesigner_promotiondialog_p.h ../lib/shared/qdesigner_propertycommand_p.h ../lib/shared/qdesigner_propertyeditor_p.h ../lib/shared/qdesigner_propertysheet_p.h ../lib/shared/qdesigner_qsettings_p.h ../lib/shared/qdesigner_stackedbox_p.h ../lib/shared/qdesigner_tabwidget_p.h ../lib/shared/qdesigner_taskmenu_p.h ../lib/shared/qdesigner_toolbar_p.h ../lib/shared/qdesigner_toolbox_p.h ../lib/shared/qdesigner_utils_p.h ../lib/shared/qdesigner_widget_p.h ../lib/shared/qdesigner_widgetbox_p.h ../lib/shared/qdesigner_widgetitem_p.h ../lib/shared/qlayout_widget_p.h ../lib/shared/qscripthighlighter_p.h ../lib/shared/qsimpleresource_p.h ../lib/shared/qtresourceeditordialog_p.h ../lib/shared/qtresourcemodel_p.h ../lib/shared/qtresourceview_p.h ../lib/shared/richtexteditor_p.h ../lib/shared/scriptcommand_p.h ../lib/shared/scriptdialog_p.h ../lib/shared/scripterrordialog_p.h ../lib/shared/shared_enums_p.h ../lib/shared/shared_global_p.h ../lib/shared/shared_settings_p.h ../lib/shared/sheet_delegate_p.h ../lib/shared/signalslotdialog_p.h ../lib/shared/spacer_widget_p.h ../lib/shared/stylesheeteditor_p.h ../lib/shared/textpropertyeditor_p.h ../lib/shared/widgetdatabase_p.h ../lib/shared/widgetfactory_p.h ../lib/shared/zoomwidget_p.h ../lib/uilib/formbuilderextra_p.h ../lib/uilib/formscriptrunner_p.h ../lib/uilib/properties_p.h ../lib/uilib/resourcebuilder_p.h ../lib/uilib/textbuilder_p.h ../lib/uilib/ui4_p.h 
Index: trunk/include/QtGui/QS60MainAppUiBase
===================================================================
--- trunk/include/QtGui/QS60MainAppUiBase	(revision 846)
+++ trunk/include/QtGui/QS60MainAppUiBase	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60mainappui.h"
Index: trunk/include/QtGui/QS60MainApplicationBase
===================================================================
--- trunk/include/QtGui/QS60MainApplicationBase	(revision 846)
+++ trunk/include/QtGui/QS60MainApplicationBase	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60mainapplication.h"
Index: trunk/include/QtGui/QS60MainDocumentBase
===================================================================
--- trunk/include/QtGui/QS60MainDocumentBase	(revision 846)
+++ trunk/include/QtGui/QS60MainDocumentBase	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60maindocument.h"
Index: trunk/include/QtGui/QS60StubAknAppUi
===================================================================
--- trunk/include/QtGui/QS60StubAknAppUi	(revision 846)
+++ trunk/include/QtGui/QS60StubAknAppUi	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60mainappui.h"
Index: trunk/include/QtGui/QS60StubAknAppUiBase
===================================================================
--- trunk/include/QtGui/QS60StubAknAppUiBase	(revision 846)
+++ trunk/include/QtGui/QS60StubAknAppUiBase	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60mainappui.h"
Index: trunk/include/QtGui/QS60StubMAknTouchPaneObserver
===================================================================
--- trunk/include/QtGui/QS60StubMAknTouchPaneObserver	(revision 846)
+++ trunk/include/QtGui/QS60StubMAknTouchPaneObserver	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60mainappui.h"
Index: trunk/include/QtGui/QS60StubMEikStatusPaneObserver
===================================================================
--- trunk/include/QtGui/QS60StubMEikStatusPaneObserver	(revision 846)
+++ trunk/include/QtGui/QS60StubMEikStatusPaneObserver	(revision 846)
@@ -0,0 +1,1 @@
+#include "qs60mainappui.h"
Index: trunk/include/QtGui/QStaticText
===================================================================
--- trunk/include/QtGui/QStaticText	(revision 846)
+++ trunk/include/QtGui/QStaticText	(revision 846)
@@ -0,0 +1,1 @@
+#include "qstatictext.h"
Index: trunk/include/QtGui/QtGui
===================================================================
--- trunk/include/QtGui/QtGui	(revision 769)
+++ trunk/include/QtGui/QtGui	(revision 846)
@@ -2,4 +2,72 @@
 #define QT_QTGUI_MODULE_H
 #include <QtCore/QtCore>
+#include "qabstractpagesetupdialog.h"
+#include "qabstractprintdialog.h"
+#include "qcolordialog.h"
+#include "qdialog.h"
+#include "qerrormessage.h"
+#include "qfiledialog.h"
+#include "qfilesystemmodel.h"
+#include "qfontdialog.h"
+#include "qinputdialog.h"
+#include "qmessagebox.h"
+#include "qpagesetupdialog.h"
+#include "qprintdialog.h"
+#include "qprintpreviewdialog.h"
+#include "qprogressdialog.h"
+#include "qwizard.h"
+#include "qvfbhdr.h"
+#include "qwsembedwidget.h"
+#include "qgraphicsanchorlayout.h"
+#include "qgraphicsgridlayout.h"
+#include "qgraphicsitem.h"
+#include "qgraphicsitemanimation.h"
+#include "qgraphicslayout.h"
+#include "qgraphicslayoutitem.h"
+#include "qgraphicslinearlayout.h"
+#include "qgraphicsproxywidget.h"
+#include "qgraphicsscene.h"
+#include "qgraphicssceneevent.h"
+#include "qgraphicstransform.h"
+#include "qgraphicsview.h"
+#include "qgraphicswidget.h"
+#include "qaction.h"
+#include "qactiongroup.h"
+#include "qapplication.h"
+#include "qboxlayout.h"
+#include "qclipboard.h"
+#include "qcursor.h"
+#include "qdesktopwidget.h"
+#include "qdrag.h"
+#include "qevent.h"
+#include "qformlayout.h"
+#include "qgesture.h"
+#include "qgesturerecognizer.h"
+#include "qgridlayout.h"
+#include "qkeysequence.h"
+#include "qlayout.h"
+#include "qlayoutitem.h"
+#include "qmime.h"
+#include "qpalette.h"
+#include "qsessionmanager.h"
+#include "qshortcut.h"
+#include "qsizepolicy.h"
+#include "qsound.h"
+#include "qstackedlayout.h"
+#include "qtooltip.h"
+#include "qwhatsthis.h"
+#include "qwidget.h"
+#include "qwidgetaction.h"
+#include "qwindowdefs.h"
+#include "qgraphicseffect.h"
+#include "qs60mainapplication.h"
+#include "qs60mainappui.h"
+#include "qs60maindocument.h"
+#include "qgenericmatrix.h"
+#include "qmatrix4x4.h"
+#include "qquaternion.h"
+#include "qvector2d.h"
+#include "qvector3d.h"
+#include "qvector4d.h"
 #include "qbitmap.h"
 #include "qicon.h"
@@ -15,9 +83,45 @@
 #include "qpixmap.h"
 #include "qpixmapcache.h"
-#include "qs60mainapplication.h"
-#include "qs60mainappui.h"
-#include "qs60maindocument.h"
-#include "qvfbhdr.h"
-#include "qwsembedwidget.h"
+#include "qsymbianevent.h"
+#include "qabstracttextdocumentlayout.h"
+#include "qfont.h"
+#include "qfontdatabase.h"
+#include "qfontinfo.h"
+#include "qfontmetrics.h"
+#include "qstatictext.h"
+#include "qsyntaxhighlighter.h"
+#include "qtextcursor.h"
+#include "qtextdocument.h"
+#include "qtextdocumentfragment.h"
+#include "qtextdocumentwriter.h"
+#include "qtextformat.h"
+#include "qtextlayout.h"
+#include "qtextlist.h"
+#include "qtextobject.h"
+#include "qtextoption.h"
+#include "qtexttable.h"
+#include "qabstractitemdelegate.h"
+#include "qabstractitemview.h"
+#include "qabstractproxymodel.h"
+#include "qcolumnview.h"
+#include "qdatawidgetmapper.h"
+#include "qdirmodel.h"
+#include "qfileiconprovider.h"
+#include "qheaderview.h"
+#include "qitemdelegate.h"
+#include "qitemeditorfactory.h"
+#include "qitemselectionmodel.h"
+#include "qlistview.h"
+#include "qlistwidget.h"
+#include "qproxymodel.h"
+#include "qsortfilterproxymodel.h"
+#include "qstandarditemmodel.h"
+#include "qstringlistmodel.h"
+#include "qstyleditemdelegate.h"
+#include "qtableview.h"
+#include "qtablewidget.h"
+#include "qtreeview.h"
+#include "qtreewidget.h"
+#include "qtreewidgetitemiterator.h"
 #include "qabstractbutton.h"
 #include "qabstractscrollarea.h"
@@ -70,57 +174,12 @@
 #include "qvalidator.h"
 #include "qworkspace.h"
-#include "qinputcontext.h"
-#include "qinputcontextfactory.h"
-#include "qinputcontextplugin.h"
-#include "qgraphicsanchorlayout.h"
-#include "qgraphicsgridlayout.h"
-#include "qgraphicsitem.h"
-#include "qgraphicsitemanimation.h"
-#include "qgraphicslayout.h"
-#include "qgraphicslayoutitem.h"
-#include "qgraphicslinearlayout.h"
-#include "qgraphicsproxywidget.h"
-#include "qgraphicsscene.h"
-#include "qgraphicssceneevent.h"
-#include "qgraphicstransform.h"
-#include "qgraphicsview.h"
-#include "qgraphicswidget.h"
-#include "qgenericmatrix.h"
-#include "qmatrix4x4.h"
-#include "qquaternion.h"
-#include "qvector2d.h"
-#include "qvector3d.h"
-#include "qvector4d.h"
-#include "qabstracttextdocumentlayout.h"
-#include "qfont.h"
-#include "qfontdatabase.h"
-#include "qfontinfo.h"
-#include "qfontmetrics.h"
-#include "qsyntaxhighlighter.h"
-#include "qtextcursor.h"
-#include "qtextdocument.h"
-#include "qtextdocumentfragment.h"
-#include "qtextdocumentwriter.h"
-#include "qtextformat.h"
-#include "qtextlayout.h"
-#include "qtextlist.h"
-#include "qtextobject.h"
-#include "qtextoption.h"
-#include "qtexttable.h"
-#include "qabstractpagesetupdialog.h"
-#include "qabstractprintdialog.h"
-#include "qcolordialog.h"
-#include "qdialog.h"
-#include "qerrormessage.h"
-#include "qfiledialog.h"
-#include "qfilesystemmodel.h"
-#include "qfontdialog.h"
-#include "qinputdialog.h"
-#include "qmessagebox.h"
-#include "qpagesetupdialog.h"
-#include "qprintdialog.h"
-#include "qprintpreviewdialog.h"
-#include "qprogressdialog.h"
-#include "qwizard.h"
+#include "qkeyeventtransition.h"
+#include "qmouseeventtransition.h"
+#include "qcompleter.h"
+#include "qdesktopservices.h"
+#include "qsystemtrayicon.h"
+#include "qundogroup.h"
+#include "qundostack.h"
+#include "qundoview.h"
 #include "qaccessible.h"
 #include "qaccessible2.h"
@@ -129,55 +188,24 @@
 #include "qaccessibleplugin.h"
 #include "qaccessiblewidget.h"
-#include "qaction.h"
-#include "qactiongroup.h"
-#include "qapplication.h"
-#include "qboxlayout.h"
-#include "qclipboard.h"
-#include "qcursor.h"
-#include "qdesktopwidget.h"
-#include "qdrag.h"
-#include "qevent.h"
-#include "qformlayout.h"
-#include "qgesture.h"
-#include "qgesturerecognizer.h"
-#include "qgridlayout.h"
-#include "qkeysequence.h"
-#include "qlayout.h"
-#include "qlayoutitem.h"
-#include "qmime.h"
-#include "qpalette.h"
-#include "qsessionmanager.h"
-#include "qshortcut.h"
-#include "qsizepolicy.h"
-#include "qsound.h"
-#include "qstackedlayout.h"
-#include "qtooltip.h"
-#include "qwhatsthis.h"
-#include "qwidget.h"
-#include "qwidgetaction.h"
-#include "qwindowdefs.h"
-#include "qabstractitemdelegate.h"
-#include "qabstractitemview.h"
-#include "qabstractproxymodel.h"
-#include "qcolumnview.h"
-#include "qdatawidgetmapper.h"
-#include "qdirmodel.h"
-#include "qfileiconprovider.h"
-#include "qheaderview.h"
-#include "qitemdelegate.h"
-#include "qitemeditorfactory.h"
-#include "qitemselectionmodel.h"
-#include "qlistview.h"
-#include "qlistwidget.h"
-#include "qproxymodel.h"
-#include "qsortfilterproxymodel.h"
-#include "qstandarditemmodel.h"
-#include "qstringlistmodel.h"
-#include "qstyleditemdelegate.h"
-#include "qtableview.h"
-#include "qtablewidget.h"
-#include "qtreeview.h"
-#include "qtreewidget.h"
-#include "qtreewidgetitemiterator.h"
+#include "qcdestyle.h"
+#include "qcleanlooksstyle.h"
+#include "qcommonstyle.h"
+#include "qgtkstyle.h"
+#include "qmotifstyle.h"
+#include "qplastiquestyle.h"
+#include "qproxystyle.h"
+#include "qs60style.h"
+#include "qstyle.h"
+#include "qstylefactory.h"
+#include "qstyleoption.h"
+#include "qstyleplugin.h"
+#include "qwindowscestyle.h"
+#include "qwindowsmobilestyle.h"
+#include "qwindowsstyle.h"
+#include "qwindowsvistastyle.h"
+#include "qwindowsxpstyle.h"
+#include "qinputcontext.h"
+#include "qinputcontextfactory.h"
+#include "qinputcontextplugin.h"
 #include "qbrush.h"
 #include "qcolor.h"
@@ -199,30 +227,3 @@
 #include "qtransform.h"
 #include "qwmatrix.h"
-#include "qsymbianevent.h"
-#include "qcdestyle.h"
-#include "qcleanlooksstyle.h"
-#include "qcommonstyle.h"
-#include "qgtkstyle.h"
-#include "qmotifstyle.h"
-#include "qplastiquestyle.h"
-#include "qproxystyle.h"
-#include "qs60style.h"
-#include "qstyle.h"
-#include "qstylefactory.h"
-#include "qstyleoption.h"
-#include "qstyleplugin.h"
-#include "qwindowscestyle.h"
-#include "qwindowsmobilestyle.h"
-#include "qwindowsstyle.h"
-#include "qwindowsvistastyle.h"
-#include "qwindowsxpstyle.h"
-#include "qkeyeventtransition.h"
-#include "qmouseeventtransition.h"
-#include "qgraphicseffect.h"
-#include "qcompleter.h"
-#include "qdesktopservices.h"
-#include "qsystemtrayicon.h"
-#include "qundogroup.h"
-#include "qundostack.h"
-#include "qundoview.h"
 #endif
Index: trunk/include/QtGui/headers.pri
===================================================================
--- trunk/include/QtGui/headers.pri	(revision 769)
+++ trunk/include/QtGui/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../gui/image/qbitmap.h ../gui/image/qicon.h ../gui/image/qiconengine.h ../gui/image/qiconengineplugin.h ../gui/image/qimage.h ../gui/image/qimageiohandler.h ../gui/image/qimagereader.h ../gui/image/qimagewriter.h ../gui/image/qmovie.h ../gui/image/qpicture.h ../gui/image/qpictureformatplugin.h ../gui/image/qpixmap.h ../gui/image/qpixmapcache.h ../gui/s60framework/qs60mainapplication.h ../gui/s60framework/qs60mainappui.h ../gui/s60framework/qs60maindocument.h ../gui/embedded/qcopchannel_qws.h ../gui/embedded/qdecoration_qws.h ../gui/embedded/qdecorationdefault_qws.h ../gui/embedded/qdecorationfactory_qws.h ../gui/embedded/qdecorationplugin_qws.h ../gui/embedded/qdecorationstyled_qws.h ../gui/embedded/qdecorationwindows_qws.h ../gui/embedded/qdirectpainter_qws.h ../gui/embedded/qkbd_qws.h ../gui/embedded/qkbddriverfactory_qws.h ../gui/embedded/qkbddriverplugin_qws.h ../gui/embedded/qkbdlinuxinput_qws.h ../gui/embedded/qkbdqnx_qws.h ../gui/embedded/qkbdtty_qws.h ../gui/embedded/qkbdum_qws.h ../gui/embedded/qkbdvfb_qws.h ../gui/embedded/qmouse_qws.h ../gui/embedded/qmousedriverfactory_qws.h ../gui/embedded/qmousedriverplugin_qws.h ../gui/embedded/qmouselinuxinput_qws.h ../gui/embedded/qmouselinuxtp_qws.h ../gui/embedded/qmousepc_qws.h ../gui/embedded/qmouseqnx_qws.h ../gui/embedded/qmousetslib_qws.h ../gui/embedded/qmousevfb_qws.h ../gui/embedded/qscreen_qws.h ../gui/embedded/qscreendriverfactory_qws.h ../gui/embedded/qscreendriverplugin_qws.h ../gui/embedded/qscreenlinuxfb_qws.h ../gui/embedded/qscreenproxy_qws.h ../gui/embedded/qscreenqnx_qws.h ../gui/embedded/qscreentransformed_qws.h ../gui/embedded/qscreenvfb_qws.h ../gui/embedded/qsoundqss_qws.h ../gui/embedded/qtransportauth_qws.h ../gui/embedded/qtransportauthdefs_qws.h ../gui/embedded/qvfbhdr.h ../gui/embedded/qwindowsystem_qws.h ../gui/embedded/qwscursor_qws.h ../gui/embedded/qwsdisplay_qws.h ../gui/embedded/qwsembedwidget.h ../gui/embedded/qwsevent_qws.h ../gui/embedded/qwsmanager_qws.h ../gui/embedded/qwsproperty_qws.h ../gui/embedded/qwsprotocolitem_qws.h ../gui/embedded/qwssocket_qws.h ../gui/embedded/qwsutils_qws.h ../gui/widgets/qabstractbutton.h ../gui/widgets/qabstractscrollarea.h ../gui/widgets/qabstractslider.h ../gui/widgets/qabstractspinbox.h ../gui/widgets/qbuttongroup.h ../gui/widgets/qcalendarwidget.h ../gui/widgets/qcheckbox.h ../gui/widgets/qcombobox.h ../gui/widgets/qcommandlinkbutton.h ../gui/widgets/qdatetimeedit.h ../gui/widgets/qdial.h ../gui/widgets/qdialogbuttonbox.h ../gui/widgets/qdockwidget.h ../gui/widgets/qfocusframe.h ../gui/widgets/qfontcombobox.h ../gui/widgets/qframe.h ../gui/widgets/qgroupbox.h ../gui/widgets/qlabel.h ../gui/widgets/qlcdnumber.h ../gui/widgets/qlineedit.h ../gui/widgets/qmaccocoaviewcontainer_mac.h ../gui/widgets/qmacnativewidget_mac.h ../gui/widgets/qmainwindow.h ../gui/widgets/qmdiarea.h ../gui/widgets/qmdisubwindow.h ../gui/widgets/qmenu.h ../gui/widgets/qmenubar.h ../gui/widgets/qmenudata.h ../gui/widgets/qplaintextedit.h ../gui/widgets/qprintpreviewwidget.h ../gui/widgets/qprogressbar.h ../gui/widgets/qpushbutton.h ../gui/widgets/qradiobutton.h ../gui/widgets/qrubberband.h ../gui/widgets/qscrollarea.h ../gui/widgets/qscrollbar.h ../gui/widgets/qsizegrip.h ../gui/widgets/qslider.h ../gui/widgets/qspinbox.h ../gui/widgets/qsplashscreen.h ../gui/widgets/qsplitter.h ../gui/widgets/qstackedwidget.h ../gui/widgets/qstatusbar.h ../gui/widgets/qtabbar.h ../gui/widgets/qtabwidget.h ../gui/widgets/qtextbrowser.h ../gui/widgets/qtextedit.h ../gui/widgets/qtoolbar.h ../gui/widgets/qtoolbox.h ../gui/widgets/qtoolbutton.h ../gui/widgets/qvalidator.h ../gui/widgets/qworkspace.h ../gui/inputmethod/qinputcontext.h ../gui/inputmethod/qinputcontextfactory.h ../gui/inputmethod/qinputcontextplugin.h ../gui/graphicsview/qgraphicsanchorlayout.h ../gui/graphicsview/qgraphicsgridlayout.h ../gui/graphicsview/qgraphicsitem.h ../gui/graphicsview/qgraphicsitemanimation.h ../gui/graphicsview/qgraphicslayout.h ../gui/graphicsview/qgraphicslayoutitem.h ../gui/graphicsview/qgraphicslinearlayout.h ../gui/graphicsview/qgraphicsproxywidget.h ../gui/graphicsview/qgraphicsscene.h ../gui/graphicsview/qgraphicssceneevent.h ../gui/graphicsview/qgraphicstransform.h ../gui/graphicsview/qgraphicsview.h ../gui/graphicsview/qgraphicswidget.h ../gui/math3d/qgenericmatrix.h ../gui/math3d/qmatrix4x4.h ../gui/math3d/qquaternion.h ../gui/math3d/qvector2d.h ../gui/math3d/qvector3d.h ../gui/math3d/qvector4d.h ../gui/text/qabstractfontengine_qws.h ../gui/text/qabstracttextdocumentlayout.h ../gui/text/qfont.h ../gui/text/qfontdatabase.h ../gui/text/qfontinfo.h ../gui/text/qfontmetrics.h ../gui/text/qsyntaxhighlighter.h ../gui/text/qtextcursor.h ../gui/text/qtextdocument.h ../gui/text/qtextdocumentfragment.h ../gui/text/qtextdocumentwriter.h ../gui/text/qtextformat.h ../gui/text/qtextlayout.h ../gui/text/qtextlist.h ../gui/text/qtextobject.h ../gui/text/qtextoption.h ../gui/text/qtexttable.h ../gui/dialogs/qabstractpagesetupdialog.h ../gui/dialogs/qabstractprintdialog.h ../gui/dialogs/qcolordialog.h ../gui/dialogs/qdialog.h ../gui/dialogs/qerrormessage.h ../gui/dialogs/qfiledialog.h ../gui/dialogs/qfilesystemmodel.h ../gui/dialogs/qfontdialog.h ../gui/dialogs/qinputdialog.h ../gui/dialogs/qmessagebox.h ../gui/dialogs/qpagesetupdialog.h ../gui/dialogs/qprintdialog.h ../gui/dialogs/qprintpreviewdialog.h ../gui/dialogs/qprogressdialog.h ../gui/dialogs/qwizard.h ../gui/accessible/qaccessible.h ../gui/accessible/qaccessible2.h ../gui/accessible/qaccessiblebridge.h ../gui/accessible/qaccessibleobject.h ../gui/accessible/qaccessibleplugin.h ../gui/accessible/qaccessiblewidget.h ../gui/kernel/qaction.h ../gui/kernel/qactiongroup.h ../gui/kernel/qapplication.h ../gui/kernel/qboxlayout.h ../gui/kernel/qclipboard.h ../gui/kernel/qcursor.h ../gui/kernel/qdesktopwidget.h ../gui/kernel/qdrag.h ../gui/kernel/qevent.h ../gui/kernel/qformlayout.h ../gui/kernel/qgesture.h ../gui/kernel/qgesturerecognizer.h ../gui/kernel/qgridlayout.h ../gui/kernel/qguifunctions_wince.h ../gui/kernel/qkeysequence.h ../gui/kernel/qlayout.h ../gui/kernel/qlayoutitem.h ../gui/kernel/qmacdefines_mac.h ../gui/kernel/qmime.h ../gui/kernel/qpalette.h ../gui/kernel/qsessionmanager.h ../gui/kernel/qshortcut.h ../gui/kernel/qsizepolicy.h ../gui/kernel/qsound.h ../gui/kernel/qstackedlayout.h ../gui/kernel/qtooltip.h ../gui/kernel/qwhatsthis.h ../gui/kernel/qwidget.h ../gui/kernel/qwidgetaction.h ../gui/kernel/qwindowdefs.h ../gui/kernel/qwindowdefs_win.h ../gui/kernel/qwindowdefs_pm.h ../gui/kernel/qx11embed_x11.h ../gui/kernel/qx11info_x11.h ../gui/itemviews/qabstractitemdelegate.h ../gui/itemviews/qabstractitemview.h ../gui/itemviews/qabstractproxymodel.h ../gui/itemviews/qcolumnview.h ../gui/itemviews/qdatawidgetmapper.h ../gui/itemviews/qdirmodel.h ../gui/itemviews/qfileiconprovider.h ../gui/itemviews/qheaderview.h ../gui/itemviews/qitemdelegate.h ../gui/itemviews/qitemeditorfactory.h ../gui/itemviews/qitemselectionmodel.h ../gui/itemviews/qlistview.h ../gui/itemviews/qlistwidget.h ../gui/itemviews/qproxymodel.h ../gui/itemviews/qsortfilterproxymodel.h ../gui/itemviews/qstandarditemmodel.h ../gui/itemviews/qstringlistmodel.h ../gui/itemviews/qstyleditemdelegate.h ../gui/itemviews/qtableview.h ../gui/itemviews/qtablewidget.h ../gui/itemviews/qtreeview.h ../gui/itemviews/qtreewidget.h ../gui/itemviews/qtreewidgetitemiterator.h ../gui/painting/qbrush.h ../gui/painting/qcolor.h ../gui/painting/qcolormap.h ../gui/painting/qdrawutil.h ../gui/painting/qmatrix.h ../gui/painting/qpaintdevice.h ../gui/painting/qpaintengine.h ../gui/painting/qpainter.h ../gui/painting/qpainterpath.h ../gui/painting/qpen.h ../gui/painting/qpolygon.h ../gui/painting/qprintengine.h ../gui/painting/qprinter.h ../gui/painting/qprinterinfo.h ../gui/painting/qregion.h ../gui/painting/qrgb.h ../gui/painting/qstylepainter.h ../gui/painting/qtransform.h ../gui/painting/qwmatrix.h ../gui/symbian/qsymbianevent.h ../gui/styles/qcdestyle.h ../gui/styles/qcleanlooksstyle.h ../gui/styles/qcommonstyle.h ../gui/styles/qgtkstyle.h ../gui/styles/qmacstyle_mac.h ../gui/styles/qmotifstyle.h ../gui/styles/qplastiquestyle.h ../gui/styles/qproxystyle.h ../gui/styles/qs60style.h ../gui/styles/qstyle.h ../gui/styles/qstylefactory.h ../gui/styles/qstyleoption.h ../gui/styles/qstyleplugin.h ../gui/styles/qwindowscestyle.h ../gui/styles/qwindowsmobilestyle.h ../gui/styles/qwindowsstyle.h ../gui/styles/qwindowsvistastyle.h ../gui/styles/qwindowsxpstyle.h ../gui/statemachine/qkeyeventtransition.h ../gui/statemachine/qmouseeventtransition.h ../gui/effects/qgraphicseffect.h ../gui/util/qcompleter.h ../gui/util/qdesktopservices.h ../gui/util/qsystemtrayicon.h ../gui/util/qundogroup.h ../gui/util/qundostack.h ../gui/util/qundoview.h ../../include/QtGui/QtGui 
-SYNCQT.HEADER_CLASSES = ../../include/QtGui/QBitmap ../../include/QtGui/QIcon ../../include/QtGui/QIconSet ../../include/QtGui/QIconEngine ../../include/QtGui/QIconEngineV2 ../../include/QtGui/QIconEngineFactoryInterface ../../include/QtGui/QIconEnginePlugin ../../include/QtGui/QIconEngineFactoryInterfaceV2 ../../include/QtGui/QIconEnginePluginV2 ../../include/QtGui/QImageTextKeyLang ../../include/QtGui/QImage ../../include/QtGui/QImageIOHandler ../../include/QtGui/QImageIOHandlerFactoryInterface ../../include/QtGui/QImageIOPlugin ../../include/QtGui/QImageReader ../../include/QtGui/QImageWriter ../../include/QtGui/QMovie ../../include/QtGui/QPicture ../../include/QtGui/QPictureIO ../../include/QtGui/QPictureFormatInterface ../../include/QtGui/QPictureFormatPlugin ../../include/QtGui/QPixmap ../../include/QtGui/QPixmapCache ../../include/QtGui/QS60MainApplication ../../include/QtGui/QS60MainAppUi ../../include/QtGui/QS60MainDocument ../../include/QtGui/QCopChannel ../../include/QtGui/QDecorationAction ../../include/QtGui/QDecoration ../../include/QtGui/QDecorationDefault ../../include/QtGui/QDecorationFactory ../../include/QtGui/QDecorationFactoryInterface ../../include/QtGui/QDecorationPlugin ../../include/QtGui/QDecorationStyled ../../include/QtGui/QDecorationWindows ../../include/QtGui/QDirectPainter ../../include/QtGui/QWSKeyboardHandler ../../include/QtGui/QKbdDriverFactory ../../include/QtGui/QWSKeyboardHandlerFactoryInterface ../../include/QtGui/QKbdDriverPlugin ../../include/QtGui/QWSLinuxInputKeyboardHandler ../../include/QtGui/QWSQnxKeyboardHandler ../../include/QtGui/QWSTtyKeyboardHandler ../../include/QtGui/QWSUmKeyboardHandler ../../include/QtGui/QVFbKeyboardHandler ../../include/QtGui/QWSPointerCalibrationData ../../include/QtGui/QWSMouseHandler ../../include/QtGui/QWSCalibratedMouseHandler ../../include/QtGui/QMouseDriverFactory ../../include/QtGui/QWSMouseHandlerFactoryInterface ../../include/QtGui/QMouseDriverPlugin ../../include/QtGui/QWSLinuxInputMouseHandler ../../include/QtGui/QWSLinuxTPMouseHandler ../../include/QtGui/QWSPcMouseHandler ../../include/QtGui/QQnxMouseHandler ../../include/QtGui/QWSTslibMouseHandler ../../include/QtGui/QVFbMouseHandler ../../include/QtGui/QScreenCursor ../../include/QtGui/QPoolEntry ../../include/QtGui/QScreen ../../include/QtGui/QScreenDriverFactory ../../include/QtGui/QScreenDriverFactoryInterface ../../include/QtGui/QScreenDriverPlugin ../../include/QtGui/QLinuxFb_Shared ../../include/QtGui/QLinuxFbScreen ../../include/QtGui/QProxyScreenCursor ../../include/QtGui/QProxyScreen ../../include/QtGui/QQnxScreen ../../include/QtGui/QTransformedScreen ../../include/QtGui/QVFbScreen ../../include/QtGui/QWSSoundServer ../../include/QtGui/QWSSoundClient ../../include/QtGui/QWSSoundServerSocket ../../include/QtGui/QTransportAuth ../../include/QtGui/QAuthDevice ../../include/QtGui/QVFbHeader ../../include/QtGui/QVFbKeyData ../../include/QtGui/QWSInternalWindowInfo ../../include/QtGui/QWSScreenSaver ../../include/QtGui/QWSWindow ../../include/QtGui/QWSServer ../../include/QtGui/QWSInputMethod ../../include/QtGui/QWSCursorMap ../../include/QtGui/QWSClient ../../include/QtGui/QWSCursor ../../include/QtGui/QWSWindowInfo ../../include/QtGui/QWSDisplay ../../include/QtGui/QWSEmbedWidget ../../include/QtGui/QWSEvent ../../include/QtGui/QWSManager ../../include/QtGui/QWSPropertyManager ../../include/QtGui/QWSProtocolItem ../../include/QtGui/QWSSocket ../../include/QtGui/QWSServerSocket ../../include/QtGui/QAbstractButton ../../include/QtGui/QAbstractScrollArea ../../include/QtGui/QAbstractSlider ../../include/QtGui/QAbstractSpinBox ../../include/QtGui/QButtonGroup ../../include/QtGui/QCalendarWidget ../../include/QtGui/QCheckBox ../../include/QtGui/QComboBox ../../include/QtGui/QCommandLinkButton ../../include/QtGui/QDateTimeEdit ../../include/QtGui/QTimeEdit ../../include/QtGui/QDateEdit ../../include/QtGui/QDial ../../include/QtGui/QDialogButtonBox ../../include/QtGui/QDockWidget ../../include/QtGui/QFocusFrame ../../include/QtGui/QFontComboBox ../../include/QtGui/QFrame ../../include/QtGui/QGroupBox ../../include/QtGui/QLabel ../../include/QtGui/QLCDNumber ../../include/QtGui/QLineEdit ../../include/QtGui/QMacCocoaViewContainer ../../include/QtGui/QMacNativeWidget ../../include/QtGui/QMainWindow ../../include/QtGui/QMdiArea ../../include/QtGui/QMdiSubWindow ../../include/QtGui/QMenu ../../include/QtGui/QMenuBar ../../include/QtGui/QMenuItem ../../include/QtGui/QPlainTextEdit ../../include/QtGui/QPlainTextDocumentLayout ../../include/QtGui/QPrintPreviewWidget ../../include/QtGui/QProgressBar ../../include/QtGui/QPushButton ../../include/QtGui/QRadioButton ../../include/QtGui/QRubberBand ../../include/QtGui/QScrollArea ../../include/QtGui/QScrollBar ../../include/QtGui/QSizeGrip ../../include/QtGui/QSlider ../../include/QtGui/QSpinBox ../../include/QtGui/QDoubleSpinBox ../../include/QtGui/QSplashScreen ../../include/QtGui/QSplitter ../../include/QtGui/QSplitterHandle ../../include/QtGui/QStackedWidget ../../include/QtGui/QStatusBar ../../include/QtGui/QTabBar ../../include/QtGui/QTabWidget ../../include/QtGui/QTextBrowser ../../include/QtGui/QTextEdit ../../include/QtGui/QToolBar ../../include/QtGui/QToolBox ../../include/QtGui/QToolButton ../../include/QtGui/QValidator ../../include/QtGui/QIntValidator ../../include/QtGui/QDoubleValidator ../../include/QtGui/QRegExpValidator ../../include/QtGui/QWorkspace ../../include/QtGui/QInputContext ../../include/QtGui/QInputContextFactory ../../include/QtGui/QInputContextFactoryInterface ../../include/QtGui/QInputContextPlugin ../../include/QtGui/QGraphicsAnchor ../../include/QtGui/QGraphicsAnchorLayout ../../include/QtGui/QGraphicsGridLayout ../../include/QtGui/QGraphicsItem ../../include/QtGui/QGraphicsObject ../../include/QtGui/QAbstractGraphicsShapeItem ../../include/QtGui/QGraphicsPathItem ../../include/QtGui/QGraphicsRectItem ../../include/QtGui/QGraphicsEllipseItem ../../include/QtGui/QGraphicsPolygonItem ../../include/QtGui/QGraphicsLineItem ../../include/QtGui/QGraphicsPixmapItem ../../include/QtGui/QGraphicsTextItem ../../include/QtGui/QGraphicsSimpleTextItem ../../include/QtGui/QGraphicsItemGroup ../../include/QtGui/QGraphicsItemAnimation ../../include/QtGui/QGraphicsLayout ../../include/QtGui/QGraphicsLayoutItem ../../include/QtGui/QGraphicsLinearLayout ../../include/QtGui/QGraphicsProxyWidget ../../include/QtGui/QGraphicsScene ../../include/QtGui/QGraphicsSceneEvent ../../include/QtGui/QGraphicsSceneMouseEvent ../../include/QtGui/QGraphicsSceneWheelEvent ../../include/QtGui/QGraphicsSceneContextMenuEvent ../../include/QtGui/QGraphicsSceneHoverEvent ../../include/QtGui/QGraphicsSceneHelpEvent ../../include/QtGui/QGraphicsSceneDragDropEvent ../../include/QtGui/QGraphicsSceneResizeEvent ../../include/QtGui/QGraphicsSceneMoveEvent ../../include/QtGui/QGraphicsTransform ../../include/QtGui/QGraphicsScale ../../include/QtGui/QGraphicsRotation ../../include/QtGui/QGraphicsView ../../include/QtGui/QGraphicsWidget ../../include/QtGui/QGenericMatrix ../../include/QtGui/QMatrix2x2 ../../include/QtGui/QMatrix2x3 ../../include/QtGui/QMatrix2x4 ../../include/QtGui/QMatrix3x2 ../../include/QtGui/QMatrix3x3 ../../include/QtGui/QMatrix3x4 ../../include/QtGui/QMatrix4x2 ../../include/QtGui/QMatrix4x3 ../../include/QtGui/QMatrix4x4 ../../include/QtGui/QQuaternion ../../include/QtGui/QVector2D ../../include/QtGui/QVector3D ../../include/QtGui/QVector4D ../../include/QtGui/QFontEngineInfo ../../include/QtGui/QFontEngineFactoryInterface ../../include/QtGui/QFontEnginePlugin ../../include/QtGui/QAbstractFontEngine ../../include/QtGui/QAbstractTextDocumentLayout ../../include/QtGui/QTextObjectInterface ../../include/QtGui/QFont ../../include/QtGui/QFontDatabase ../../include/QtGui/QFontInfo ../../include/QtGui/QFontMetrics ../../include/QtGui/QFontMetricsF ../../include/QtGui/QSyntaxHighlighter ../../include/QtGui/QTextCursor ../../include/QtGui/QAbstractUndoItem ../../include/QtGui/QTextDocument ../../include/QtGui/QTextDocumentFragment ../../include/QtGui/QTextDocumentWriter ../../include/QtGui/QTextLength ../../include/QtGui/QTextFormat ../../include/QtGui/QTextCharFormat ../../include/QtGui/QTextBlockFormat ../../include/QtGui/QTextListFormat ../../include/QtGui/QTextImageFormat ../../include/QtGui/QTextFrameFormat ../../include/QtGui/QTextTableFormat ../../include/QtGui/QTextTableCellFormat ../../include/QtGui/QTextInlineObject ../../include/QtGui/QTextLayout ../../include/QtGui/QTextLine ../../include/QtGui/QTextList ../../include/QtGui/QTextObject ../../include/QtGui/QTextBlockGroup ../../include/QtGui/QTextFrameLayoutData ../../include/QtGui/QTextFrame ../../include/QtGui/QTextBlockUserData ../../include/QtGui/QTextBlock ../../include/QtGui/QTextFragment ../../include/QtGui/QTextOption ../../include/QtGui/QTextTableCell ../../include/QtGui/QTextTable ../../include/QtGui/QAbstractPageSetupDialog ../../include/QtGui/QAbstractPrintDialog ../../include/QtGui/QColorDialog ../../include/QtGui/QDialog ../../include/QtGui/QErrorMessage ../../include/QtGui/QFileDialog ../../include/QtGui/QFileSystemModel ../../include/QtGui/QFontDialog ../../include/QtGui/QInputDialog ../../include/QtGui/QMessageBox ../../include/QtGui/QPageSetupDialog ../../include/QtGui/QUnixPrintWidget ../../include/QtGui/QPrintDialog ../../include/QtGui/QPrintPreviewDialog ../../include/QtGui/QProgressDialog ../../include/QtGui/QWizard ../../include/QtGui/QWizardPage ../../include/QtGui/QAccessible ../../include/QtGui/QAccessibleInterface ../../include/QtGui/QAccessibleInterfaceEx ../../include/QtGui/QAccessibleEvent ../../include/QtGui/QAccessible2Interface ../../include/QtGui/QAccessibleTextInterface ../../include/QtGui/QAccessibleEditableTextInterface ../../include/QtGui/QAccessibleSimpleEditableTextInterface ../../include/QtGui/QAccessibleValueInterface ../../include/QtGui/QAccessibleTableInterface ../../include/QtGui/QAccessibleActionInterface ../../include/QtGui/QAccessibleImageInterface ../../include/QtGui/QAccessibleBridge ../../include/QtGui/QAccessibleBridgeFactoryInterface ../../include/QtGui/QAccessibleBridgePlugin ../../include/QtGui/QAccessibleObject ../../include/QtGui/QAccessibleObjectEx ../../include/QtGui/QAccessibleApplication ../../include/QtGui/QAccessibleFactoryInterface ../../include/QtGui/QAccessiblePlugin ../../include/QtGui/QAccessibleWidget ../../include/QtGui/QAccessibleWidgetEx ../../include/QtGui/QAction ../../include/QtGui/QActionGroup ../../include/QtGui/QApplication ../../include/QtGui/QBoxLayout ../../include/QtGui/QHBoxLayout ../../include/QtGui/QVBoxLayout ../../include/QtGui/QClipboard ../../include/QtGui/QCursor ../../include/QtGui/QCursorShape ../../include/QtGui/QDesktopWidget ../../include/QtGui/QDrag ../../include/QtGui/QtEvents ../../include/QtGui/QInputEvent ../../include/QtGui/QMouseEvent ../../include/QtGui/QHoverEvent ../../include/QtGui/QWheelEvent ../../include/QtGui/QTabletEvent ../../include/QtGui/QKeyEvent ../../include/QtGui/QFocusEvent ../../include/QtGui/QPaintEvent ../../include/QtGui/QUpdateLaterEvent ../../include/QtGui/QMoveEvent ../../include/QtGui/QResizeEvent ../../include/QtGui/QCloseEvent ../../include/QtGui/QIconDragEvent ../../include/QtGui/QShowEvent ../../include/QtGui/QHideEvent ../../include/QtGui/QContextMenuEvent ../../include/QtGui/QInputMethodEvent ../../include/QtGui/QDropEvent ../../include/QtGui/QDragMoveEvent ../../include/QtGui/QDragEnterEvent ../../include/QtGui/QDragResponseEvent ../../include/QtGui/QDragLeaveEvent ../../include/QtGui/QHelpEvent ../../include/QtGui/QStatusTipEvent ../../include/QtGui/QWhatsThisClickedEvent ../../include/QtGui/QActionEvent ../../include/QtGui/QFileOpenEvent ../../include/QtGui/QToolBarChangeEvent ../../include/QtGui/QShortcutEvent ../../include/QtGui/QClipboardEvent ../../include/QtGui/QWindowStateChangeEvent ../../include/QtGui/QMenubarUpdatedEvent ../../include/QtGui/QTouchEvent ../../include/QtGui/QGestureEvent ../../include/QtGui/QFormLayout ../../include/QtGui/QGesture ../../include/QtGui/QPanGesture ../../include/QtGui/QPinchGesture ../../include/QtGui/QSwipeGesture ../../include/QtGui/QTapGesture ../../include/QtGui/QTapAndHoldGesture ../../include/QtGui/QGestureRecognizer ../../include/QtGui/QGridLayout ../../include/QtGui/QKeySequence ../../include/QtGui/QLayoutIterator ../../include/QtGui/QLayout ../../include/QtGui/QLayoutItem ../../include/QtGui/QSpacerItem ../../include/QtGui/QWidgetItem ../../include/QtGui/QWidgetItemV2 ../../include/QtGui/QMimeSource ../../include/QtGui/QWindowsMime ../../include/QtGui/QMacMime ../../include/QtGui/QMacPasteboardMime ../../include/QtGui/QPalette ../../include/QtGui/QColorGroup ../../include/QtGui/QSessionManager ../../include/QtGui/QShortcut ../../include/QtGui/QSizePolicy ../../include/QtGui/QSound ../../include/QtGui/QStackedLayout ../../include/QtGui/QToolTip ../../include/QtGui/QWhatsThis ../../include/QtGui/QWidgetData ../../include/QtGui/QWidget ../../include/QtGui/QWidgetAction ../../include/QtGui/QWidgetList ../../include/QtGui/QWidgetMapper ../../include/QtGui/QWidgetSet ../../include/QtGui/QX11EmbedWidget ../../include/QtGui/QX11EmbedContainer ../../include/QtGui/QX11Info ../../include/QtGui/QAbstractItemDelegate ../../include/QtGui/QAbstractItemView ../../include/QtGui/QAbstractProxyModel ../../include/QtGui/QColumnView ../../include/QtGui/QDataWidgetMapper ../../include/QtGui/QDirModel ../../include/QtGui/QFileIconProvider ../../include/QtGui/QHeaderView ../../include/QtGui/QItemDelegate ../../include/QtGui/QItemEditorCreatorBase ../../include/QtGui/QItemEditorCreator ../../include/QtGui/QStandardItemEditorCreator ../../include/QtGui/QItemEditorFactory ../../include/QtGui/QItemSelectionRange ../../include/QtGui/QItemSelectionModel ../../include/QtGui/QItemSelection ../../include/QtGui/QListView ../../include/QtGui/QListWidgetItem ../../include/QtGui/QListWidget ../../include/QtGui/QProxyModel ../../include/QtGui/QSortFilterProxyModel ../../include/QtGui/QStandardItem ../../include/QtGui/QStandardItemModel ../../include/QtGui/QStringListModel ../../include/QtGui/QStyledItemDelegate ../../include/QtGui/QTableView ../../include/QtGui/QTableWidgetSelectionRange ../../include/QtGui/QTableWidgetItem ../../include/QtGui/QTableWidget ../../include/QtGui/QTreeView ../../include/QtGui/QTreeWidgetItem ../../include/QtGui/QTreeWidget ../../include/QtGui/QTreeWidgetItemIterator ../../include/QtGui/QBrush ../../include/QtGui/QBrushData ../../include/QtGui/QGradientStop ../../include/QtGui/QGradientStops ../../include/QtGui/QGradient ../../include/QtGui/QLinearGradient ../../include/QtGui/QRadialGradient ../../include/QtGui/QConicalGradient ../../include/QtGui/QColor ../../include/QtGui/QColormap ../../include/QtGui/QTileRules ../../include/QtGui/QMatrix ../../include/QtGui/QPaintDevice ../../include/QtGui/QTextItem ../../include/QtGui/QPaintEngine ../../include/QtGui/QPaintEngineState ../../include/QtGui/QPainter ../../include/QtGui/QPainterPath ../../include/QtGui/QPainterPathPrivate ../../include/QtGui/QPainterPathStroker ../../include/QtGui/QPen ../../include/QtGui/QPolygon ../../include/QtGui/QPolygonF ../../include/QtGui/QPrintEngine ../../include/QtGui/QPrinter ../../include/QtGui/QPrinterInfo ../../include/QtGui/QRegion ../../include/QtGui/QRgb ../../include/QtGui/QStylePainter ../../include/QtGui/QTransform ../../include/QtGui/QWMatrix ../../include/QtGui/QSymbianEvent ../../include/QtGui/QCDEStyle ../../include/QtGui/QCleanlooksStyle ../../include/QtGui/QCommonStyle ../../include/QtGui/QGtkStyle ../../include/QtGui/QMacStyle ../../include/QtGui/QMotifStyle ../../include/QtGui/QPlastiqueStyle ../../include/QtGui/QProxyStyle ../../include/QtGui/QS60Style ../../include/QtGui/QStyle ../../include/QtGui/QStyleFactory ../../include/QtGui/QStyleOption ../../include/QtGui/QStyleOptionFocusRect ../../include/QtGui/QStyleOptionFrame ../../include/QtGui/QStyleOptionFrameV2 ../../include/QtGui/QStyleOptionFrameV3 ../../include/QtGui/QStyleOptionTabWidgetFrame ../../include/QtGui/QStyleOptionTabWidgetFrameV2 ../../include/QtGui/QStyleOptionTabBarBase ../../include/QtGui/QStyleOptionTabBarBaseV2 ../../include/QtGui/QStyleOptionHeader ../../include/QtGui/QStyleOptionButton ../../include/QtGui/QStyleOptionTab ../../include/QtGui/QStyleOptionTabV2 ../../include/QtGui/QStyleOptionTabV3 ../../include/QtGui/QStyleOptionToolBar ../../include/QtGui/QStyleOptionProgressBar ../../include/QtGui/QStyleOptionProgressBarV2 ../../include/QtGui/QStyleOptionMenuItem ../../include/QtGui/QStyleOptionQ3ListViewItem ../../include/QtGui/QStyleOptionQ3DockWindow ../../include/QtGui/QStyleOptionDockWidget ../../include/QtGui/QStyleOptionDockWidgetV2 ../../include/QtGui/QStyleOptionViewItem ../../include/QtGui/QStyleOptionViewItemV2 ../../include/QtGui/QStyleOptionViewItemV3 ../../include/QtGui/QStyleOptionViewItemV4 ../../include/QtGui/QStyleOptionToolBox ../../include/QtGui/QStyleOptionToolBoxV2 ../../include/QtGui/QStyleOptionRubberBand ../../include/QtGui/QStyleOptionComplex ../../include/QtGui/QStyleOptionSlider ../../include/QtGui/QStyleOptionSpinBox ../../include/QtGui/QStyleOptionQ3ListView ../../include/QtGui/QStyleOptionToolButton ../../include/QtGui/QStyleOptionComboBox ../../include/QtGui/QStyleOptionTitleBar ../../include/QtGui/QStyleOptionGroupBox ../../include/QtGui/QStyleOptionSizeGrip ../../include/QtGui/QStyleOptionGraphicsItem ../../include/QtGui/QStyleHintReturn ../../include/QtGui/QStyleHintReturnMask ../../include/QtGui/QStyleHintReturnVariant ../../include/QtGui/QStyleFactoryInterface ../../include/QtGui/QStylePlugin ../../include/QtGui/QWindowsCEStyle ../../include/QtGui/QWindowsMobileStyle ../../include/QtGui/QWindowsStyle ../../include/QtGui/QWindowsVistaStyle ../../include/QtGui/QWindowsXPStyle ../../include/QtGui/QKeyEventTransition ../../include/QtGui/QMouseEventTransition ../../include/QtGui/QGraphicsEffect ../../include/QtGui/QGraphicsColorizeEffect ../../include/QtGui/QGraphicsBlurEffect ../../include/QtGui/QGraphicsDropShadowEffect ../../include/QtGui/QGraphicsOpacityEffect ../../include/QtGui/QCompleter ../../include/QtGui/QDesktopServices ../../include/QtGui/QSystemTrayIcon ../../include/QtGui/QUndoGroup ../../include/QtGui/QUndoCommand ../../include/QtGui/QUndoStack ../../include/QtGui/QUndoView 
-SYNCQT.PRIVATE_HEADER_FILES = ../gui/image/qbmphandler_p.h ../gui/image/qicon_p.h ../gui/image/qiconloader_p.h ../gui/image/qimage_p.h ../gui/image/qimagepixmapcleanuphooks_p.h ../gui/image/qnativeimage_p.h ../gui/image/qpaintengine_pic_p.h ../gui/image/qpicture_p.h ../gui/image/qpixmap_mac_p.h ../gui/image/qpixmap_raster_p.h ../gui/image/qpixmap_s60_p.h ../gui/image/qpixmap_x11_p.h ../gui/image/qpixmapcache_p.h ../gui/image/qpixmapdata_p.h ../gui/image/qpixmapdatafactory_p.h ../gui/image/qpixmapfilter_p.h ../gui/image/qpnghandler_p.h ../gui/image/qppmhandler_p.h ../gui/image/qxbmhandler_p.h ../gui/image/qxpmhandler_p.h ../gui/s60framework/qs60mainapplication_p.h ../gui/embedded/qkbd_defaultmap_qws_p.h ../gui/embedded/qkbd_qws_p.h ../gui/embedded/qlock_p.h ../gui/embedded/qscreenmulti_qws_p.h ../gui/embedded/qtransportauth_qws_p.h ../gui/embedded/qunixsocket_p.h ../gui/embedded/qunixsocketserver_p.h ../gui/embedded/qwindowsystem_p.h ../gui/embedded/qwscommand_qws_p.h ../gui/embedded/qwsdisplay_qws_p.h ../gui/embedded/qwslock_p.h ../gui/embedded/qwsmanager_p.h ../gui/embedded/qwssharedmemory_p.h ../gui/embedded/qwssignalhandler_p.h ../gui/widgets/qabstractbutton_p.h ../gui/widgets/qabstractscrollarea_p.h ../gui/widgets/qabstractslider_p.h ../gui/widgets/qabstractspinbox_p.h ../gui/widgets/qcalendartextnavigator_p.h ../gui/widgets/qcocoamenu_mac_p.h ../gui/widgets/qcocoatoolbardelegate_mac_p.h ../gui/widgets/qcombobox_p.h ../gui/widgets/qdatetimeedit_p.h ../gui/widgets/qdockarealayout_p.h ../gui/widgets/qdockwidget_p.h ../gui/widgets/qeffects_p.h ../gui/widgets/qframe_p.h ../gui/widgets/qlabel_p.h ../gui/widgets/qlinecontrol_p.h ../gui/widgets/qlineedit_p.h ../gui/widgets/qmainwindowlayout_p.h ../gui/widgets/qmdiarea_p.h ../gui/widgets/qmdisubwindow_p.h ../gui/widgets/qmenu_p.h ../gui/widgets/qmenu_wince_resource_p.h ../gui/widgets/qmenubar_p.h ../gui/widgets/qplaintextedit_p.h ../gui/widgets/qpushbutton_p.h ../gui/widgets/qscrollarea_p.h ../gui/widgets/qsplitter_p.h ../gui/widgets/qtabbar_p.h ../gui/widgets/qtextedit_p.h ../gui/widgets/qtoolbar_p.h ../gui/widgets/qtoolbararealayout_p.h ../gui/widgets/qtoolbarextension_p.h ../gui/widgets/qtoolbarlayout_p.h ../gui/widgets/qtoolbarseparator_p.h ../gui/widgets/qwidgetanimator_p.h ../gui/widgets/qwidgetresizehandler_p.h ../gui/inputmethod/qcoefepinputcontext_p.h ../gui/inputmethod/qinputcontext_p.h ../gui/inputmethod/qmacinputcontext_p.h ../gui/inputmethod/qwininputcontext_p.h ../gui/inputmethod/qwsinputcontext_p.h ../gui/inputmethod/qximinputcontext_p.h ../gui/graphicsview/qgraph_p.h ../gui/graphicsview/qgraphicsanchorlayout_p.h ../gui/graphicsview/qgraphicsitem_p.h ../gui/graphicsview/qgraphicslayout_p.h ../gui/graphicsview/qgraphicslayoutitem_p.h ../gui/graphicsview/qgraphicsproxywidget_p.h ../gui/graphicsview/qgraphicsscene_bsp_p.h ../gui/graphicsview/qgraphicsscene_p.h ../gui/graphicsview/qgraphicsscenebsptreeindex_p.h ../gui/graphicsview/qgraphicssceneindex_p.h ../gui/graphicsview/qgraphicsscenelinearindex_p.h ../gui/graphicsview/qgraphicstransform_p.h ../gui/graphicsview/qgraphicsview_p.h ../gui/graphicsview/qgraphicswidget_p.h ../gui/graphicsview/qgridlayoutengine_p.h ../gui/graphicsview/qsimplex_p.h ../gui/text/qabstractfontengine_p.h ../gui/text/qabstracttextdocumentlayout_p.h ../gui/text/qcssparser_p.h ../gui/text/qfont_p.h ../gui/text/qfontengine_ft_p.h ../gui/text/qfontengine_p.h ../gui/text/qfontengine_qpf_p.h ../gui/text/qfontengine_s60_p.h ../gui/text/qfontengine_win_p.h ../gui/text/qfontengine_x11_p.h ../gui/text/qfontengineglyphcache_p.h ../gui/text/qfontsubset_p.h ../gui/text/qfragmentmap_p.h ../gui/text/qtextcontrol_p.h ../gui/text/qtextcontrol_p_p.h ../gui/text/qtextcursor_p.h ../gui/text/qtextdocument_p.h ../gui/text/qtextdocumentfragment_p.h ../gui/text/qtextdocumentlayout_p.h ../gui/text/qtextengine_p.h ../gui/text/qtextformat_p.h ../gui/text/qtexthtmlparser_p.h ../gui/text/qtextimagehandler_p.h ../gui/text/qtextobject_p.h ../gui/text/qtextodfwriter_p.h ../gui/text/qtexttable_p.h ../gui/text/qzipreader_p.h ../gui/text/qzipwriter_p.h ../gui/dialogs/qabstractpagesetupdialog_p.h ../gui/dialogs/qabstractprintdialog_p.h ../gui/dialogs/qcolordialog_p.h ../gui/dialogs/qdialog_p.h ../gui/dialogs/qfiledialog_p.h ../gui/dialogs/qfileinfogatherer_p.h ../gui/dialogs/qfilesystemmodel_p.h ../gui/dialogs/qfontdialog_p.h ../gui/dialogs/qfscompleter_p.h ../gui/dialogs/qpagesetupdialog_unix_p.h ../gui/dialogs/qsidebar_p.h ../gui/dialogs/qwizard_win_p.h ../gui/accessible/qaccessible_mac_p.h ../gui/kernel/qaction_p.h ../gui/kernel/qapplication_p.h ../gui/kernel/qclipboard_p.h ../gui/kernel/qcocoaapplication_mac_p.h ../gui/kernel/qcocoaapplicationdelegate_mac_p.h ../gui/kernel/qcocoamenuloader_mac_p.h ../gui/kernel/qcocoapanel_mac_p.h ../gui/kernel/qcocoasharedwindowmethods_mac_p.h ../gui/kernel/qcocoaview_mac_p.h ../gui/kernel/qcocoawindow_mac_p.h ../gui/kernel/qcocoawindowcustomthemeframe_mac_p.h ../gui/kernel/qcocoawindowdelegate_mac_p.h ../gui/kernel/qcursor_p.h ../gui/kernel/qdesktopwidget_mac_p.h ../gui/kernel/qdnd_p.h ../gui/kernel/qevent_p.h ../gui/kernel/qeventdispatcher_glib_qws_p.h ../gui/kernel/qeventdispatcher_mac_p.h ../gui/kernel/qeventdispatcher_qws_p.h ../gui/kernel/qeventdispatcher_s60_p.h ../gui/kernel/qeventdispatcher_x11_p.h ../gui/kernel/qgesture_p.h ../gui/kernel/qgesturemanager_p.h ../gui/kernel/qguieventdispatcher_glib_p.h ../gui/kernel/qguiplatformplugin_p.h ../gui/kernel/qkde_p.h ../gui/kernel/qkeymapper_p.h ../gui/kernel/qkeysequence_p.h ../gui/kernel/qlayout_p.h ../gui/kernel/qlayoutengine_p.h ../gui/kernel/qmacgesturerecognizer_mac_p.h ../gui/kernel/qmultitouch_mac_p.h ../gui/kernel/qnsframeview_mac_p.h ../gui/kernel/qnsthemeframe_mac_p.h ../gui/kernel/qnstitledframe_mac_p.h ../gui/kernel/qshortcutmap_p.h ../gui/kernel/qsoftkeymanager_common_p.h ../gui/kernel/qsoftkeymanager_p.h ../gui/kernel/qsoftkeymanager_s60_p.h ../gui/kernel/qsound_p.h ../gui/kernel/qstandardgestures_p.h ../gui/kernel/qt_cocoa_helpers_mac_p.h ../gui/kernel/qt_gui_pch.h ../gui/kernel/qt_mac_p.h ../gui/kernel/qt_s60_p.h ../gui/kernel/qt_x11_p.h ../gui/kernel/qwidget_p.h ../gui/kernel/qwidgetaction_p.h ../gui/kernel/qwinnativepangesturerecognizer_win_p.h ../gui/itemviews/qabstractitemview_p.h ../gui/itemviews/qabstractproxymodel_p.h ../gui/itemviews/qbsptree_p.h ../gui/itemviews/qcolumnview_p.h ../gui/itemviews/qcolumnviewgrip_p.h ../gui/itemviews/qheaderview_p.h ../gui/itemviews/qitemeditorfactory_p.h ../gui/itemviews/qitemselectionmodel_p.h ../gui/itemviews/qlistview_p.h ../gui/itemviews/qlistwidget_p.h ../gui/itemviews/qproxymodel_p.h ../gui/itemviews/qstandarditemmodel_p.h ../gui/itemviews/qtableview_p.h ../gui/itemviews/qtablewidget_p.h ../gui/itemviews/qtreeview_p.h ../gui/itemviews/qtreewidget_p.h ../gui/itemviews/qtreewidgetitemiterator_p.h ../gui/itemviews/qwidgetitemdata_p.h ../gui/painting/qbackingstore_p.h ../gui/painting/qbezier_p.h ../gui/painting/qcolor_p.h ../gui/painting/qcssutil_p.h ../gui/painting/qcups_p.h ../gui/painting/qdatabuffer_p.h ../gui/painting/qdrawhelper_armv6_p.h ../gui/painting/qdrawhelper_mmx_p.h ../gui/painting/qdrawhelper_neon_p.h ../gui/painting/qdrawhelper_p.h ../gui/painting/qdrawhelper_sse_p.h ../gui/painting/qdrawhelper_x86_p.h ../gui/painting/qemulationpaintengine_p.h ../gui/painting/qfixed_p.h ../gui/painting/qgraphicssystem_mac_p.h ../gui/painting/qgraphicssystem_p.h ../gui/painting/qgraphicssystem_qws_p.h ../gui/painting/qgraphicssystem_raster_p.h ../gui/painting/qgraphicssystemfactory_p.h ../gui/painting/qgraphicssystemplugin_p.h ../gui/painting/qgrayraster_p.h ../gui/painting/qimagescale_p.h ../gui/painting/qmath_p.h ../gui/painting/qmemrotate_p.h ../gui/painting/qoutlinemapper_p.h ../gui/painting/qpaintbuffer_p.h ../gui/painting/qpaintengine_alpha_p.h ../gui/painting/qpaintengine_mac_p.h ../gui/painting/qpaintengine_p.h ../gui/painting/qpaintengine_preview_p.h ../gui/painting/qpaintengine_raster_p.h ../gui/painting/qpaintengine_s60_p.h ../gui/painting/qpaintengine_x11_p.h ../gui/painting/qpaintengineex_p.h ../gui/painting/qpainter_p.h ../gui/painting/qpainterpath_p.h ../gui/painting/qpathclipper_p.h ../gui/painting/qpdf_p.h ../gui/painting/qpen_p.h ../gui/painting/qpolygonclipper_p.h ../gui/painting/qprintengine_mac_p.h ../gui/painting/qprintengine_pdf_p.h ../gui/painting/qprintengine_ps_p.h ../gui/painting/qprintengine_qws_p.h ../gui/painting/qprintengine_win_p.h ../gui/painting/qprinter_p.h ../gui/painting/qprinterinfo_unix_p.h ../gui/painting/qrasterdefs_p.h ../gui/painting/qrasterizer_p.h ../gui/painting/qstroker_p.h ../gui/painting/qtessellator_p.h ../gui/painting/qtextureglyphcache_p.h ../gui/painting/qvectorpath_p.h ../gui/painting/qwindowsurface_mac_p.h ../gui/painting/qwindowsurface_p.h ../gui/painting/qwindowsurface_pm_p.h ../gui/painting/qwindowsurface_qws_p.h ../gui/painting/qwindowsurface_raster_p.h ../gui/painting/qwindowsurface_s60_p.h ../gui/painting/qwindowsurface_x11_p.h ../gui/styles/qcleanlooksstyle_p.h ../gui/styles/qcommonstyle_p.h ../gui/styles/qcommonstylepixmaps_p.h ../gui/styles/qgtkpainter_p.h ../gui/styles/qgtkstyle_p.h ../gui/styles/qmacstylepixmaps_mac_p.h ../gui/styles/qmotifstyle_p.h ../gui/styles/qproxystyle_p.h ../gui/styles/qs60style_p.h ../gui/styles/qstyle_p.h ../gui/styles/qstylehelper_p.h ../gui/styles/qstylesheetstyle_p.h ../gui/styles/qwindowscestyle_p.h ../gui/styles/qwindowsmobilestyle_p.h ../gui/styles/qwindowsstyle_p.h ../gui/styles/qwindowsvistastyle_p.h ../gui/styles/qwindowsxpstyle_p.h ../gui/egl/qegl_p.h ../gui/egl/qeglproperties_p.h ../gui/statemachine/qbasickeyeventtransition_p.h ../gui/statemachine/qbasicmouseeventtransition_p.h ../gui/effects/qgraphicseffect_p.h ../gui/util/qcompleter_p.h ../gui/util/qsystemtrayicon_p.h ../gui/util/qundostack_p.h 
+SYNCQT.HEADER_FILES = ../gui/dialogs/qabstractpagesetupdialog.h ../gui/dialogs/qabstractprintdialog.h ../gui/dialogs/qcolordialog.h ../gui/dialogs/qdialog.h ../gui/dialogs/qerrormessage.h ../gui/dialogs/qfiledialog.h ../gui/dialogs/qfilesystemmodel.h ../gui/dialogs/qfontdialog.h ../gui/dialogs/qinputdialog.h ../gui/dialogs/qmessagebox.h ../gui/dialogs/qpagesetupdialog.h ../gui/dialogs/qprintdialog.h ../gui/dialogs/qprintpreviewdialog.h ../gui/dialogs/qprogressdialog.h ../gui/dialogs/qwizard.h ../gui/embedded/qcopchannel_qws.h ../gui/embedded/qdecoration_qws.h ../gui/embedded/qdecorationdefault_qws.h ../gui/embedded/qdecorationfactory_qws.h ../gui/embedded/qdecorationplugin_qws.h ../gui/embedded/qdecorationstyled_qws.h ../gui/embedded/qdecorationwindows_qws.h ../gui/embedded/qdirectpainter_qws.h ../gui/embedded/qkbd_qws.h ../gui/embedded/qkbddriverfactory_qws.h ../gui/embedded/qkbddriverplugin_qws.h ../gui/embedded/qkbdlinuxinput_qws.h ../gui/embedded/qkbdqnx_qws.h ../gui/embedded/qkbdtty_qws.h ../gui/embedded/qkbdum_qws.h ../gui/embedded/qkbdvfb_qws.h ../gui/embedded/qmouse_qws.h ../gui/embedded/qmousedriverfactory_qws.h ../gui/embedded/qmousedriverplugin_qws.h ../gui/embedded/qmouselinuxinput_qws.h ../gui/embedded/qmouselinuxtp_qws.h ../gui/embedded/qmousepc_qws.h ../gui/embedded/qmouseqnx_qws.h ../gui/embedded/qmousetslib_qws.h ../gui/embedded/qmousevfb_qws.h ../gui/embedded/qscreen_qws.h ../gui/embedded/qscreendriverfactory_qws.h ../gui/embedded/qscreendriverplugin_qws.h ../gui/embedded/qscreenlinuxfb_qws.h ../gui/embedded/qscreenproxy_qws.h ../gui/embedded/qscreenqnx_qws.h ../gui/embedded/qscreentransformed_qws.h ../gui/embedded/qscreenvfb_qws.h ../gui/embedded/qsoundqss_qws.h ../gui/embedded/qtransportauth_qws.h ../gui/embedded/qtransportauthdefs_qws.h ../gui/embedded/qvfbhdr.h ../gui/embedded/qwindowsystem_qws.h ../gui/embedded/qwscursor_qws.h ../gui/embedded/qwsdisplay_qws.h ../gui/embedded/qwsembedwidget.h ../gui/embedded/qwsevent_qws.h ../gui/embedded/qwsmanager_qws.h ../gui/embedded/qwsproperty_qws.h ../gui/embedded/qwsprotocolitem_qws.h ../gui/embedded/qwssocket_qws.h ../gui/embedded/qwsutils_qws.h ../gui/graphicsview/qgraphicsanchorlayout.h ../gui/graphicsview/qgraphicsgridlayout.h ../gui/graphicsview/qgraphicsitem.h ../gui/graphicsview/qgraphicsitemanimation.h ../gui/graphicsview/qgraphicslayout.h ../gui/graphicsview/qgraphicslayoutitem.h ../gui/graphicsview/qgraphicslinearlayout.h ../gui/graphicsview/qgraphicsproxywidget.h ../gui/graphicsview/qgraphicsscene.h ../gui/graphicsview/qgraphicssceneevent.h ../gui/graphicsview/qgraphicstransform.h ../gui/graphicsview/qgraphicsview.h ../gui/graphicsview/qgraphicswidget.h ../gui/kernel/qaction.h ../gui/kernel/qactiongroup.h ../gui/kernel/qapplication.h ../gui/kernel/qboxlayout.h ../gui/kernel/qclipboard.h ../gui/kernel/qcursor.h ../gui/kernel/qdesktopwidget.h ../gui/kernel/qdrag.h ../gui/kernel/qevent.h ../gui/kernel/qformlayout.h ../gui/kernel/qgesture.h ../gui/kernel/qgesturerecognizer.h ../gui/kernel/qgridlayout.h ../gui/kernel/qguifunctions_wince.h ../gui/kernel/qkeysequence.h ../gui/kernel/qlayout.h ../gui/kernel/qlayoutitem.h ../gui/kernel/qmacdefines_mac.h ../gui/kernel/qmime.h ../gui/kernel/qpalette.h ../gui/kernel/qsessionmanager.h ../gui/kernel/qshortcut.h ../gui/kernel/qsizepolicy.h ../gui/kernel/qsound.h ../gui/kernel/qstackedlayout.h ../gui/kernel/qtooltip.h ../gui/kernel/qwhatsthis.h ../gui/kernel/qwidget.h ../gui/kernel/qwidgetaction.h ../gui/kernel/qwindowdefs.h  ../gui/kernel/qwindowdefs_pm.h ../gui/kernel/qwindowdefs_win.h ../gui/kernel/qx11embed_x11.h ../gui/kernel/qx11info_x11.h ../gui/effects/qgraphicseffect.h ../gui/s60framework/qs60mainapplication.h ../gui/s60framework/qs60mainappui.h ../gui/s60framework/qs60maindocument.h ../gui/math3d/qgenericmatrix.h ../gui/math3d/qmatrix4x4.h ../gui/math3d/qquaternion.h ../gui/math3d/qvector2d.h ../gui/math3d/qvector3d.h ../gui/math3d/qvector4d.h ../gui/image/qbitmap.h ../gui/image/qicon.h ../gui/image/qiconengine.h ../gui/image/qiconengineplugin.h ../gui/image/qimage.h ../gui/image/qimageiohandler.h ../gui/image/qimagereader.h ../gui/image/qimagewriter.h ../gui/image/qmovie.h ../gui/image/qpicture.h ../gui/image/qpictureformatplugin.h ../gui/image/qpixmap.h ../gui/image/qpixmapcache.h ../gui/symbian/qsymbianevent.h ../gui/text/qabstractfontengine_qws.h ../gui/text/qabstracttextdocumentlayout.h ../gui/text/qfont.h ../gui/text/qfontdatabase.h ../gui/text/qfontinfo.h ../gui/text/qfontmetrics.h ../gui/text/qstatictext.h ../gui/text/qsyntaxhighlighter.h ../gui/text/qtextcursor.h ../gui/text/qtextdocument.h ../gui/text/qtextdocumentfragment.h ../gui/text/qtextdocumentwriter.h ../gui/text/qtextformat.h ../gui/text/qtextlayout.h ../gui/text/qtextlist.h ../gui/text/qtextobject.h ../gui/text/qtextoption.h ../gui/text/qtexttable.h ../gui/itemviews/qabstractitemdelegate.h ../gui/itemviews/qabstractitemview.h ../gui/itemviews/qabstractproxymodel.h ../gui/itemviews/qcolumnview.h ../gui/itemviews/qdatawidgetmapper.h ../gui/itemviews/qdirmodel.h ../gui/itemviews/qfileiconprovider.h ../gui/itemviews/qheaderview.h ../gui/itemviews/qitemdelegate.h ../gui/itemviews/qitemeditorfactory.h ../gui/itemviews/qitemselectionmodel.h ../gui/itemviews/qlistview.h ../gui/itemviews/qlistwidget.h ../gui/itemviews/qproxymodel.h ../gui/itemviews/qsortfilterproxymodel.h ../gui/itemviews/qstandarditemmodel.h ../gui/itemviews/qstringlistmodel.h ../gui/itemviews/qstyleditemdelegate.h ../gui/itemviews/qtableview.h ../gui/itemviews/qtablewidget.h ../gui/itemviews/qtreeview.h ../gui/itemviews/qtreewidget.h ../gui/itemviews/qtreewidgetitemiterator.h ../gui/widgets/qabstractbutton.h ../gui/widgets/qabstractscrollarea.h ../gui/widgets/qabstractslider.h ../gui/widgets/qabstractspinbox.h ../gui/widgets/qbuttongroup.h ../gui/widgets/qcalendarwidget.h ../gui/widgets/qcheckbox.h ../gui/widgets/qcombobox.h ../gui/widgets/qcommandlinkbutton.h ../gui/widgets/qdatetimeedit.h ../gui/widgets/qdial.h ../gui/widgets/qdialogbuttonbox.h ../gui/widgets/qdockwidget.h ../gui/widgets/qfocusframe.h ../gui/widgets/qfontcombobox.h ../gui/widgets/qframe.h ../gui/widgets/qgroupbox.h ../gui/widgets/qlabel.h ../gui/widgets/qlcdnumber.h ../gui/widgets/qlineedit.h ../gui/widgets/qmaccocoaviewcontainer_mac.h ../gui/widgets/qmacnativewidget_mac.h ../gui/widgets/qmainwindow.h ../gui/widgets/qmdiarea.h ../gui/widgets/qmdisubwindow.h ../gui/widgets/qmenu.h ../gui/widgets/qmenubar.h ../gui/widgets/qmenudata.h ../gui/widgets/qplaintextedit.h ../gui/widgets/qprintpreviewwidget.h ../gui/widgets/qprogressbar.h ../gui/widgets/qpushbutton.h ../gui/widgets/qradiobutton.h ../gui/widgets/qrubberband.h ../gui/widgets/qscrollarea.h ../gui/widgets/qscrollbar.h ../gui/widgets/qsizegrip.h ../gui/widgets/qslider.h ../gui/widgets/qspinbox.h ../gui/widgets/qsplashscreen.h ../gui/widgets/qsplitter.h ../gui/widgets/qstackedwidget.h ../gui/widgets/qstatusbar.h ../gui/widgets/qtabbar.h ../gui/widgets/qtabwidget.h ../gui/widgets/qtextbrowser.h ../gui/widgets/qtextedit.h ../gui/widgets/qtoolbar.h ../gui/widgets/qtoolbox.h ../gui/widgets/qtoolbutton.h ../gui/widgets/qvalidator.h ../gui/widgets/qworkspace.h ../gui/statemachine/qkeyeventtransition.h ../gui/statemachine/qmouseeventtransition.h ../gui/util/qcompleter.h ../gui/util/qdesktopservices.h ../gui/util/qsystemtrayicon.h ../gui/util/qundogroup.h ../gui/util/qundostack.h ../gui/util/qundoview.h ../gui/accessible/qaccessible.h ../gui/accessible/qaccessible2.h ../gui/accessible/qaccessiblebridge.h ../gui/accessible/qaccessibleobject.h ../gui/accessible/qaccessibleplugin.h ../gui/accessible/qaccessiblewidget.h ../gui/styles/qcdestyle.h ../gui/styles/qcleanlooksstyle.h ../gui/styles/qcommonstyle.h ../gui/styles/qgtkstyle.h ../gui/styles/qmacstyle_mac.h ../gui/styles/qmotifstyle.h ../gui/styles/qplastiquestyle.h ../gui/styles/qproxystyle.h ../gui/styles/qs60style.h ../gui/styles/qstyle.h ../gui/styles/qstylefactory.h ../gui/styles/qstyleoption.h ../gui/styles/qstyleplugin.h ../gui/styles/qwindowscestyle.h ../gui/styles/qwindowsmobilestyle.h ../gui/styles/qwindowsstyle.h ../gui/styles/qwindowsvistastyle.h ../gui/styles/qwindowsxpstyle.h ../gui/inputmethod/qinputcontext.h ../gui/inputmethod/qinputcontextfactory.h ../gui/inputmethod/qinputcontextplugin.h ../gui/painting/qbrush.h ../gui/painting/qcolor.h ../gui/painting/qcolormap.h ../gui/painting/qdrawutil.h ../gui/painting/qmatrix.h ../gui/painting/qpaintdevice.h ../gui/painting/qpaintengine.h ../gui/painting/qpainter.h ../gui/painting/qpainterpath.h ../gui/painting/qpen.h ../gui/painting/qpolygon.h ../gui/painting/qprintengine.h ../gui/painting/qprinter.h ../gui/painting/qprinterinfo.h ../gui/painting/qregion.h ../gui/painting/qrgb.h ../gui/painting/qstylepainter.h ../gui/painting/qtransform.h ../gui/painting/qwmatrix.h ../../include/QtGui/QtGui 
+SYNCQT.HEADER_CLASSES = ../../include/QtGui/QAbstractPageSetupDialog ../../include/QtGui/QAbstractPrintDialog ../../include/QtGui/QColorDialog ../../include/QtGui/QDialog ../../include/QtGui/QErrorMessage ../../include/QtGui/QFileDialog ../../include/QtGui/QFileSystemModel ../../include/QtGui/QFontDialog ../../include/QtGui/QInputDialog ../../include/QtGui/QMessageBox ../../include/QtGui/QPageSetupDialog ../../include/QtGui/QUnixPrintWidget ../../include/QtGui/QPrintDialog ../../include/QtGui/QPrintPreviewDialog ../../include/QtGui/QProgressDialog ../../include/QtGui/QWizard ../../include/QtGui/QWizardPage ../../include/QtGui/QCopChannel ../../include/QtGui/QDecorationAction ../../include/QtGui/QDecoration ../../include/QtGui/QDecorationDefault ../../include/QtGui/QDecorationFactory ../../include/QtGui/QDecorationFactoryInterface ../../include/QtGui/QDecorationPlugin ../../include/QtGui/QDecorationStyled ../../include/QtGui/QDecorationWindows ../../include/QtGui/QDirectPainter ../../include/QtGui/QWSKeyboardHandler ../../include/QtGui/QKbdDriverFactory ../../include/QtGui/QWSKeyboardHandlerFactoryInterface ../../include/QtGui/QKbdDriverPlugin ../../include/QtGui/QWSLinuxInputKeyboardHandler ../../include/QtGui/QWSQnxKeyboardHandler ../../include/QtGui/QWSTtyKeyboardHandler ../../include/QtGui/QWSUmKeyboardHandler ../../include/QtGui/QVFbKeyboardHandler ../../include/QtGui/QWSPointerCalibrationData ../../include/QtGui/QWSMouseHandler ../../include/QtGui/QWSCalibratedMouseHandler ../../include/QtGui/QMouseDriverFactory ../../include/QtGui/QWSMouseHandlerFactoryInterface ../../include/QtGui/QMouseDriverPlugin ../../include/QtGui/QWSLinuxInputMouseHandler ../../include/QtGui/QWSLinuxTPMouseHandler ../../include/QtGui/QWSPcMouseHandler ../../include/QtGui/QQnxMouseHandler ../../include/QtGui/QWSTslibMouseHandler ../../include/QtGui/QVFbMouseHandler ../../include/QtGui/QScreenCursor ../../include/QtGui/QPoolEntry ../../include/QtGui/QScreen ../../include/QtGui/QScreenDriverFactory ../../include/QtGui/QScreenDriverFactoryInterface ../../include/QtGui/QScreenDriverPlugin ../../include/QtGui/QLinuxFb_Shared ../../include/QtGui/QLinuxFbScreen ../../include/QtGui/QProxyScreenCursor ../../include/QtGui/QProxyScreen ../../include/QtGui/QQnxScreen ../../include/QtGui/QTransformedScreen ../../include/QtGui/QVFbScreen ../../include/QtGui/QWSSoundServer ../../include/QtGui/QWSSoundClient ../../include/QtGui/QWSSoundServerSocket ../../include/QtGui/QTransportAuth ../../include/QtGui/QAuthDevice ../../include/QtGui/QVFbHeader ../../include/QtGui/QVFbKeyData ../../include/QtGui/QWSInternalWindowInfo ../../include/QtGui/QWSScreenSaver ../../include/QtGui/QWSWindow ../../include/QtGui/QWSServer ../../include/QtGui/QWSInputMethod ../../include/QtGui/QWSCursorMap ../../include/QtGui/QWSClient ../../include/QtGui/QWSCursor ../../include/QtGui/QWSWindowInfo ../../include/QtGui/QWSDisplay ../../include/QtGui/QWSEmbedWidget ../../include/QtGui/QWSEvent ../../include/QtGui/QWSManager ../../include/QtGui/QWSPropertyManager ../../include/QtGui/QWSProtocolItem ../../include/QtGui/QWSSocket ../../include/QtGui/QWSServerSocket ../../include/QtGui/QGraphicsAnchor ../../include/QtGui/QGraphicsAnchorLayout ../../include/QtGui/QGraphicsGridLayout ../../include/QtGui/QGraphicsItem ../../include/QtGui/QGraphicsObject ../../include/QtGui/QAbstractGraphicsShapeItem ../../include/QtGui/QGraphicsPathItem ../../include/QtGui/QGraphicsRectItem ../../include/QtGui/QGraphicsEllipseItem ../../include/QtGui/QGraphicsPolygonItem ../../include/QtGui/QGraphicsLineItem ../../include/QtGui/QGraphicsPixmapItem ../../include/QtGui/QGraphicsTextItem ../../include/QtGui/QGraphicsSimpleTextItem ../../include/QtGui/QGraphicsItemGroup ../../include/QtGui/QGraphicsItemAnimation ../../include/QtGui/QGraphicsLayout ../../include/QtGui/QGraphicsLayoutItem ../../include/QtGui/QGraphicsLinearLayout ../../include/QtGui/QGraphicsProxyWidget ../../include/QtGui/QGraphicsScene ../../include/QtGui/QGraphicsSceneEvent ../../include/QtGui/QGraphicsSceneMouseEvent ../../include/QtGui/QGraphicsSceneWheelEvent ../../include/QtGui/QGraphicsSceneContextMenuEvent ../../include/QtGui/QGraphicsSceneHoverEvent ../../include/QtGui/QGraphicsSceneHelpEvent ../../include/QtGui/QGraphicsSceneDragDropEvent ../../include/QtGui/QGraphicsSceneResizeEvent ../../include/QtGui/QGraphicsSceneMoveEvent ../../include/QtGui/QGraphicsTransform ../../include/QtGui/QGraphicsScale ../../include/QtGui/QGraphicsRotation ../../include/QtGui/QGraphicsView ../../include/QtGui/QGraphicsWidget ../../include/QtGui/QAction ../../include/QtGui/QActionGroup ../../include/QtGui/QApplication ../../include/QtGui/QBoxLayout ../../include/QtGui/QHBoxLayout ../../include/QtGui/QVBoxLayout ../../include/QtGui/QClipboard ../../include/QtGui/QCursor ../../include/QtGui/QCursorShape ../../include/QtGui/QDesktopWidget ../../include/QtGui/QDrag ../../include/QtGui/QtEvents ../../include/QtGui/QInputEvent ../../include/QtGui/QMouseEvent ../../include/QtGui/QHoverEvent ../../include/QtGui/QWheelEvent ../../include/QtGui/QTabletEvent ../../include/QtGui/QKeyEvent ../../include/QtGui/QFocusEvent ../../include/QtGui/QPaintEvent ../../include/QtGui/QUpdateLaterEvent ../../include/QtGui/QMoveEvent ../../include/QtGui/QResizeEvent ../../include/QtGui/QCloseEvent ../../include/QtGui/QIconDragEvent ../../include/QtGui/QShowEvent ../../include/QtGui/QHideEvent ../../include/QtGui/QContextMenuEvent ../../include/QtGui/QInputMethodEvent ../../include/QtGui/QDropEvent ../../include/QtGui/QDragMoveEvent ../../include/QtGui/QDragEnterEvent ../../include/QtGui/QDragResponseEvent ../../include/QtGui/QDragLeaveEvent ../../include/QtGui/QHelpEvent ../../include/QtGui/QStatusTipEvent ../../include/QtGui/QWhatsThisClickedEvent ../../include/QtGui/QActionEvent ../../include/QtGui/QFileOpenEvent ../../include/QtGui/QToolBarChangeEvent ../../include/QtGui/QShortcutEvent ../../include/QtGui/QClipboardEvent ../../include/QtGui/QWindowStateChangeEvent ../../include/QtGui/QMenubarUpdatedEvent ../../include/QtGui/QTouchEvent ../../include/QtGui/QGestureEvent ../../include/QtGui/QFormLayout ../../include/QtGui/QGesture ../../include/QtGui/QPanGesture ../../include/QtGui/QPinchGesture ../../include/QtGui/QSwipeGesture ../../include/QtGui/QTapGesture ../../include/QtGui/QTapAndHoldGesture ../../include/QtGui/QGestureRecognizer ../../include/QtGui/QGridLayout ../../include/QtGui/QKeySequence ../../include/QtGui/QLayoutIterator ../../include/QtGui/QLayout ../../include/QtGui/QLayoutItem ../../include/QtGui/QSpacerItem ../../include/QtGui/QWidgetItem ../../include/QtGui/QWidgetItemV2 ../../include/QtGui/QMimeSource ../../include/QtGui/QWindowsMime ../../include/QtGui/QMacMime ../../include/QtGui/QMacPasteboardMime ../../include/QtGui/QPalette ../../include/QtGui/QColorGroup ../../include/QtGui/QSessionManager ../../include/QtGui/QShortcut ../../include/QtGui/QSizePolicy ../../include/QtGui/QSound ../../include/QtGui/QStackedLayout ../../include/QtGui/QToolTip ../../include/QtGui/QWhatsThis ../../include/QtGui/QWidgetData ../../include/QtGui/QWidget ../../include/QtGui/QWidgetAction ../../include/QtGui/QWidgetList ../../include/QtGui/QWidgetMapper ../../include/QtGui/QWidgetSet ../../include/QtGui/QX11EmbedWidget ../../include/QtGui/QX11EmbedContainer ../../include/QtGui/QX11Info ../../include/QtGui/QGraphicsEffect ../../include/QtGui/QGraphicsColorizeEffect ../../include/QtGui/QGraphicsBlurEffect ../../include/QtGui/QGraphicsDropShadowEffect ../../include/QtGui/QGraphicsOpacityEffect ../../include/QtGui/QS60MainApplicationBase ../../include/QtGui/QS60MainApplication ../../include/QtGui/QS60MainAppUiBase ../../include/QtGui/QS60StubAknAppUiBase ../../include/QtGui/QS60StubMEikStatusPaneObserver ../../include/QtGui/QS60StubMAknTouchPaneObserver ../../include/QtGui/QS60StubAknAppUi ../../include/QtGui/QS60MainAppUi ../../include/QtGui/QS60MainDocumentBase ../../include/QtGui/QS60MainDocument ../../include/QtGui/QGenericMatrix ../../include/QtGui/QMatrix2x2 ../../include/QtGui/QMatrix2x3 ../../include/QtGui/QMatrix2x4 ../../include/QtGui/QMatrix3x2 ../../include/QtGui/QMatrix3x3 ../../include/QtGui/QMatrix3x4 ../../include/QtGui/QMatrix4x2 ../../include/QtGui/QMatrix4x3 ../../include/QtGui/QMatrix4x4 ../../include/QtGui/QQuaternion ../../include/QtGui/QVector2D ../../include/QtGui/QVector3D ../../include/QtGui/QVector4D ../../include/QtGui/QBitmap ../../include/QtGui/QIcon ../../include/QtGui/QIconSet ../../include/QtGui/QIconEngine ../../include/QtGui/QIconEngineV2 ../../include/QtGui/QIconEngineFactoryInterface ../../include/QtGui/QIconEnginePlugin ../../include/QtGui/QIconEngineFactoryInterfaceV2 ../../include/QtGui/QIconEnginePluginV2 ../../include/QtGui/QImageTextKeyLang ../../include/QtGui/QImage ../../include/QtGui/QImageIOHandler ../../include/QtGui/QImageIOHandlerFactoryInterface ../../include/QtGui/QImageIOPlugin ../../include/QtGui/QImageReader ../../include/QtGui/QImageWriter ../../include/QtGui/QMovie ../../include/QtGui/QPicture ../../include/QtGui/QPictureIO ../../include/QtGui/QPictureFormatInterface ../../include/QtGui/QPictureFormatPlugin ../../include/QtGui/QPixmap ../../include/QtGui/QPixmapCache ../../include/QtGui/QSymbianEvent ../../include/QtGui/QFontEngineInfo ../../include/QtGui/QFontEngineFactoryInterface ../../include/QtGui/QFontEnginePlugin ../../include/QtGui/QAbstractFontEngine ../../include/QtGui/QAbstractTextDocumentLayout ../../include/QtGui/QTextObjectInterface ../../include/QtGui/QFont ../../include/QtGui/QFontDatabase ../../include/QtGui/QFontInfo ../../include/QtGui/QFontMetrics ../../include/QtGui/QFontMetricsF ../../include/QtGui/QStaticText ../../include/QtGui/QSyntaxHighlighter ../../include/QtGui/QTextCursor ../../include/QtGui/QAbstractUndoItem ../../include/QtGui/QTextDocument ../../include/QtGui/QTextDocumentFragment ../../include/QtGui/QTextDocumentWriter ../../include/QtGui/QTextLength ../../include/QtGui/QTextFormat ../../include/QtGui/QTextCharFormat ../../include/QtGui/QTextBlockFormat ../../include/QtGui/QTextListFormat ../../include/QtGui/QTextImageFormat ../../include/QtGui/QTextFrameFormat ../../include/QtGui/QTextTableFormat ../../include/QtGui/QTextTableCellFormat ../../include/QtGui/QTextInlineObject ../../include/QtGui/QTextLayout ../../include/QtGui/QTextLine ../../include/QtGui/QTextList ../../include/QtGui/QTextObject ../../include/QtGui/QTextBlockGroup ../../include/QtGui/QTextFrameLayoutData ../../include/QtGui/QTextFrame ../../include/QtGui/QTextBlockUserData ../../include/QtGui/QTextBlock ../../include/QtGui/QTextFragment ../../include/QtGui/QTextOption ../../include/QtGui/QTextTableCell ../../include/QtGui/QTextTable ../../include/QtGui/QAbstractItemDelegate ../../include/QtGui/QAbstractItemView ../../include/QtGui/QAbstractProxyModel ../../include/QtGui/QColumnView ../../include/QtGui/QDataWidgetMapper ../../include/QtGui/QDirModel ../../include/QtGui/QFileIconProvider ../../include/QtGui/QHeaderView ../../include/QtGui/QItemDelegate ../../include/QtGui/QItemEditorCreatorBase ../../include/QtGui/QItemEditorCreator ../../include/QtGui/QStandardItemEditorCreator ../../include/QtGui/QItemEditorFactory ../../include/QtGui/QItemSelectionRange ../../include/QtGui/QItemSelectionModel ../../include/QtGui/QItemSelection ../../include/QtGui/QListView ../../include/QtGui/QListWidgetItem ../../include/QtGui/QListWidget ../../include/QtGui/QProxyModel ../../include/QtGui/QSortFilterProxyModel ../../include/QtGui/QStandardItem ../../include/QtGui/QStandardItemModel ../../include/QtGui/QStringListModel ../../include/QtGui/QStyledItemDelegate ../../include/QtGui/QTableView ../../include/QtGui/QTableWidgetSelectionRange ../../include/QtGui/QTableWidgetItem ../../include/QtGui/QTableWidget ../../include/QtGui/QTreeView ../../include/QtGui/QTreeWidgetItem ../../include/QtGui/QTreeWidget ../../include/QtGui/QTreeWidgetItemIterator ../../include/QtGui/QAbstractButton ../../include/QtGui/QAbstractScrollArea ../../include/QtGui/QAbstractSlider ../../include/QtGui/QAbstractSpinBox ../../include/QtGui/QButtonGroup ../../include/QtGui/QCalendarWidget ../../include/QtGui/QCheckBox ../../include/QtGui/QComboBox ../../include/QtGui/QCommandLinkButton ../../include/QtGui/QDateTimeEdit ../../include/QtGui/QTimeEdit ../../include/QtGui/QDateEdit ../../include/QtGui/QDial ../../include/QtGui/QDialogButtonBox ../../include/QtGui/QDockWidget ../../include/QtGui/QFocusFrame ../../include/QtGui/QFontComboBox ../../include/QtGui/QFrame ../../include/QtGui/QGroupBox ../../include/QtGui/QLabel ../../include/QtGui/QLCDNumber ../../include/QtGui/QLineEdit ../../include/QtGui/QMacCocoaViewContainer ../../include/QtGui/QMacNativeWidget ../../include/QtGui/QMainWindow ../../include/QtGui/QMdiArea ../../include/QtGui/QMdiSubWindow ../../include/QtGui/QMenu ../../include/QtGui/QMenuBar ../../include/QtGui/QMenuItem ../../include/QtGui/QPlainTextEdit ../../include/QtGui/QPlainTextDocumentLayout ../../include/QtGui/QPrintPreviewWidget ../../include/QtGui/QProgressBar ../../include/QtGui/QPushButton ../../include/QtGui/QRadioButton ../../include/QtGui/QRubberBand ../../include/QtGui/QScrollArea ../../include/QtGui/QScrollBar ../../include/QtGui/QSizeGrip ../../include/QtGui/QSlider ../../include/QtGui/QSpinBox ../../include/QtGui/QDoubleSpinBox ../../include/QtGui/QSplashScreen ../../include/QtGui/QSplitter ../../include/QtGui/QSplitterHandle ../../include/QtGui/QStackedWidget ../../include/QtGui/QStatusBar ../../include/QtGui/QTabBar ../../include/QtGui/QTabWidget ../../include/QtGui/QTextBrowser ../../include/QtGui/QTextEdit ../../include/QtGui/QToolBar ../../include/QtGui/QToolBox ../../include/QtGui/QToolButton ../../include/QtGui/QValidator ../../include/QtGui/QIntValidator ../../include/QtGui/QDoubleValidator ../../include/QtGui/QRegExpValidator ../../include/QtGui/QWorkspace ../../include/QtGui/QKeyEventTransition ../../include/QtGui/QMouseEventTransition ../../include/QtGui/QCompleter ../../include/QtGui/QDesktopServices ../../include/QtGui/QSystemTrayIcon ../../include/QtGui/QUndoGroup ../../include/QtGui/QUndoCommand ../../include/QtGui/QUndoStack ../../include/QtGui/QUndoView ../../include/QtGui/QAccessible ../../include/QtGui/QAccessibleInterface ../../include/QtGui/QAccessibleInterfaceEx ../../include/QtGui/QAccessibleEvent ../../include/QtGui/QAccessible2Interface ../../include/QtGui/QAccessibleTextInterface ../../include/QtGui/QAccessibleEditableTextInterface ../../include/QtGui/QAccessibleSimpleEditableTextInterface ../../include/QtGui/QAccessibleValueInterface ../../include/QtGui/QAccessibleTableInterface ../../include/QtGui/QAccessibleActionInterface ../../include/QtGui/QAccessibleImageInterface ../../include/QtGui/QAccessibleBridge ../../include/QtGui/QAccessibleBridgeFactoryInterface ../../include/QtGui/QAccessibleBridgePlugin ../../include/QtGui/QAccessibleObject ../../include/QtGui/QAccessibleObjectEx ../../include/QtGui/QAccessibleApplication ../../include/QtGui/QAccessibleFactoryInterface ../../include/QtGui/QAccessiblePlugin ../../include/QtGui/QAccessibleWidget ../../include/QtGui/QAccessibleWidgetEx ../../include/QtGui/QCDEStyle ../../include/QtGui/QCleanlooksStyle ../../include/QtGui/QCommonStyle ../../include/QtGui/QGtkStyle ../../include/QtGui/QMacStyle ../../include/QtGui/QMotifStyle ../../include/QtGui/QPlastiqueStyle ../../include/QtGui/QProxyStyle ../../include/QtGui/QS60Style ../../include/QtGui/QStyle ../../include/QtGui/QStyleFactory ../../include/QtGui/QStyleOption ../../include/QtGui/QStyleOptionFocusRect ../../include/QtGui/QStyleOptionFrame ../../include/QtGui/QStyleOptionFrameV2 ../../include/QtGui/QStyleOptionFrameV3 ../../include/QtGui/QStyleOptionTabWidgetFrame ../../include/QtGui/QStyleOptionTabWidgetFrameV2 ../../include/QtGui/QStyleOptionTabBarBase ../../include/QtGui/QStyleOptionTabBarBaseV2 ../../include/QtGui/QStyleOptionHeader ../../include/QtGui/QStyleOptionButton ../../include/QtGui/QStyleOptionTab ../../include/QtGui/QStyleOptionTabV2 ../../include/QtGui/QStyleOptionTabV3 ../../include/QtGui/QStyleOptionToolBar ../../include/QtGui/QStyleOptionProgressBar ../../include/QtGui/QStyleOptionProgressBarV2 ../../include/QtGui/QStyleOptionMenuItem ../../include/QtGui/QStyleOptionQ3ListViewItem ../../include/QtGui/QStyleOptionQ3DockWindow ../../include/QtGui/QStyleOptionDockWidget ../../include/QtGui/QStyleOptionDockWidgetV2 ../../include/QtGui/QStyleOptionViewItem ../../include/QtGui/QStyleOptionViewItemV2 ../../include/QtGui/QStyleOptionViewItemV3 ../../include/QtGui/QStyleOptionViewItemV4 ../../include/QtGui/QStyleOptionToolBox ../../include/QtGui/QStyleOptionToolBoxV2 ../../include/QtGui/QStyleOptionRubberBand ../../include/QtGui/QStyleOptionComplex ../../include/QtGui/QStyleOptionSlider ../../include/QtGui/QStyleOptionSpinBox ../../include/QtGui/QStyleOptionQ3ListView ../../include/QtGui/QStyleOptionToolButton ../../include/QtGui/QStyleOptionComboBox ../../include/QtGui/QStyleOptionTitleBar ../../include/QtGui/QStyleOptionGroupBox ../../include/QtGui/QStyleOptionSizeGrip ../../include/QtGui/QStyleOptionGraphicsItem ../../include/QtGui/QStyleHintReturn ../../include/QtGui/QStyleHintReturnMask ../../include/QtGui/QStyleHintReturnVariant ../../include/QtGui/QStyleFactoryInterface ../../include/QtGui/QStylePlugin ../../include/QtGui/QWindowsCEStyle ../../include/QtGui/QWindowsMobileStyle ../../include/QtGui/QWindowsStyle ../../include/QtGui/QWindowsVistaStyle ../../include/QtGui/QWindowsXPStyle ../../include/QtGui/QInputContext ../../include/QtGui/QInputContextFactory ../../include/QtGui/QInputContextFactoryInterface ../../include/QtGui/QInputContextPlugin ../../include/QtGui/QBrush ../../include/QtGui/QBrushData ../../include/QtGui/QGradientStop ../../include/QtGui/QGradientStops ../../include/QtGui/QGradient ../../include/QtGui/QLinearGradient ../../include/QtGui/QRadialGradient ../../include/QtGui/QConicalGradient ../../include/QtGui/QColor ../../include/QtGui/QColormap ../../include/QtGui/QTileRules ../../include/QtGui/QMatrix ../../include/QtGui/QPaintDevice ../../include/QtGui/QTextItem ../../include/QtGui/QPaintEngine ../../include/QtGui/QPaintEngineState ../../include/QtGui/QPainter ../../include/QtGui/QPainterPath ../../include/QtGui/QPainterPathPrivate ../../include/QtGui/QPainterPathStroker ../../include/QtGui/QPen ../../include/QtGui/QPolygon ../../include/QtGui/QPolygonF ../../include/QtGui/QPrintEngine ../../include/QtGui/QPrinter ../../include/QtGui/QPrinterInfo ../../include/QtGui/QRegion ../../include/QtGui/QRgb ../../include/QtGui/QStylePainter ../../include/QtGui/QTransform ../../include/QtGui/QWMatrix 
+SYNCQT.PRIVATE_HEADER_FILES = ../gui/dialogs/qabstractpagesetupdialog_p.h ../gui/dialogs/qabstractprintdialog_p.h ../gui/dialogs/qcolordialog_p.h ../gui/dialogs/qdialog_p.h ../gui/dialogs/qfiledialog_p.h ../gui/dialogs/qfiledialog_win_p.h ../gui/dialogs/qfileinfogatherer_p.h ../gui/dialogs/qfilesystemmodel_p.h ../gui/dialogs/qfontdialog_p.h ../gui/dialogs/qfscompleter_p.h ../gui/dialogs/qpagesetupdialog_unix_p.h ../gui/dialogs/qsidebar_p.h ../gui/dialogs/qwizard_win_p.h ../gui/embedded/qkbd_defaultmap_qws_p.h ../gui/embedded/qkbd_qws_p.h ../gui/embedded/qlock_p.h ../gui/embedded/qscreenmulti_qws_p.h ../gui/embedded/qtransportauth_qws_p.h ../gui/embedded/qunixsocket_p.h ../gui/embedded/qunixsocketserver_p.h ../gui/embedded/qwindowsystem_p.h ../gui/embedded/qwscommand_qws_p.h ../gui/embedded/qwsdisplay_qws_p.h ../gui/embedded/qwslock_p.h ../gui/embedded/qwsmanager_p.h ../gui/embedded/qwssharedmemory_p.h ../gui/embedded/qwssignalhandler_p.h ../gui/graphicsview/qgraph_p.h ../gui/graphicsview/qgraphicsanchorlayout_p.h ../gui/graphicsview/qgraphicsitem_p.h ../gui/graphicsview/qgraphicslayout_p.h ../gui/graphicsview/qgraphicslayoutitem_p.h ../gui/graphicsview/qgraphicsproxywidget_p.h ../gui/graphicsview/qgraphicsscene_bsp_p.h ../gui/graphicsview/qgraphicsscene_p.h ../gui/graphicsview/qgraphicsscenebsptreeindex_p.h ../gui/graphicsview/qgraphicssceneindex_p.h ../gui/graphicsview/qgraphicsscenelinearindex_p.h ../gui/graphicsview/qgraphicstransform_p.h ../gui/graphicsview/qgraphicsview_p.h ../gui/graphicsview/qgraphicswidget_p.h ../gui/graphicsview/qgridlayoutengine_p.h ../gui/graphicsview/qsimplex_p.h ../gui/kernel/qaction_p.h ../gui/kernel/qapplication_p.h ../gui/kernel/qclipboard_p.h ../gui/kernel/qcocoaapplication_mac_p.h ../gui/kernel/qcocoaapplicationdelegate_mac_p.h ../gui/kernel/qcocoamenuloader_mac_p.h ../gui/kernel/qcocoapanel_mac_p.h ../gui/kernel/qcocoasharedwindowmethods_mac_p.h ../gui/kernel/qcocoaview_mac_p.h ../gui/kernel/qcocoawindow_mac_p.h ../gui/kernel/qcocoawindowcustomthemeframe_mac_p.h ../gui/kernel/qcocoawindowdelegate_mac_p.h ../gui/kernel/qcursor_p.h ../gui/kernel/qdesktopwidget_mac_p.h ../gui/kernel/qdnd_p.h ../gui/kernel/qevent_p.h ../gui/kernel/qeventdispatcher_glib_qws_p.h ../gui/kernel/qeventdispatcher_mac_p.h ../gui/kernel/qeventdispatcher_qws_p.h ../gui/kernel/qeventdispatcher_s60_p.h ../gui/kernel/qeventdispatcher_x11_p.h ../gui/kernel/qgesture_p.h ../gui/kernel/qgesturemanager_p.h ../gui/kernel/qguieventdispatcher_glib_p.h ../gui/kernel/qguiplatformplugin_p.h ../gui/kernel/qkde_p.h ../gui/kernel/qkeymapper_p.h ../gui/kernel/qkeysequence_p.h ../gui/kernel/qlayout_p.h ../gui/kernel/qlayoutengine_p.h ../gui/kernel/qmacgesturerecognizer_mac_p.h ../gui/kernel/qmultitouch_mac_p.h ../gui/kernel/qnsframeview_mac_p.h ../gui/kernel/qnsthemeframe_mac_p.h ../gui/kernel/qnstitledframe_mac_p.h ../gui/kernel/qshortcutmap_p.h ../gui/kernel/qsoftkeymanager_common_p.h ../gui/kernel/qsoftkeymanager_p.h ../gui/kernel/qsoftkeymanager_s60_p.h ../gui/kernel/qsound_p.h ../gui/kernel/qstandardgestures_p.h ../gui/kernel/qt_cocoa_helpers_mac_p.h ../gui/kernel/qt_gui_pch.h ../gui/kernel/qt_mac_p.h ../gui/kernel/qt_s60_p.h ../gui/kernel/qt_x11_p.h ../gui/kernel/qwidget_p.h ../gui/kernel/qwidgetaction_p.h ../gui/kernel/qwinnativepangesturerecognizer_win_p.h ../gui/effects/qgraphicseffect_p.h ../gui/s60framework/qs60mainapplication_p.h ../gui/image/qbmphandler_p.h ../gui/image/qgifhandler_p.h ../gui/image/qicon_p.h ../gui/image/qiconloader_p.h ../gui/image/qimage_p.h ../gui/image/qimagepixmapcleanuphooks_p.h ../gui/image/qjpeghandler_p.h ../gui/image/qmnghandler_p.h ../gui/image/qnativeimage_p.h ../gui/image/qpaintengine_pic_p.h ../gui/image/qpicture_p.h ../gui/image/qpixmap_mac_p.h ../gui/image/qpixmap_raster_p.h ../gui/image/qpixmap_s60_p.h ../gui/image/qpixmap_x11_p.h ../gui/image/qpixmapcache_p.h ../gui/image/qpixmapdata_p.h ../gui/image/qpixmapdatafactory_p.h ../gui/image/qpixmapfilter_p.h ../gui/image/qpnghandler_p.h ../gui/image/qppmhandler_p.h ../gui/image/qtiffhandler_p.h ../gui/image/qxbmhandler_p.h ../gui/image/qxpmhandler_p.h ../gui/text/qabstractfontengine_p.h ../gui/text/qabstracttextdocumentlayout_p.h ../gui/text/qcssparser_p.h ../gui/text/qfont_p.h ../gui/text/qfontengine_ft_p.h ../gui/text/qfontengine_p.h ../gui/text/qfontengine_qpf_p.h ../gui/text/qfontengine_s60_p.h ../gui/text/qfontengine_win_p.h ../gui/text/qfontengine_x11_p.h ../gui/text/qfontengineglyphcache_p.h ../gui/text/qfontsubset_p.h ../gui/text/qfragmentmap_p.h ../gui/text/qstatictext_p.h ../gui/text/qtextcontrol_p.h ../gui/text/qtextcontrol_p_p.h ../gui/text/qtextcursor_p.h ../gui/text/qtextdocument_p.h ../gui/text/qtextdocumentfragment_p.h ../gui/text/qtextdocumentlayout_p.h ../gui/text/qtextengine_p.h ../gui/text/qtextformat_p.h ../gui/text/qtexthtmlparser_p.h ../gui/text/qtextimagehandler_p.h ../gui/text/qtextobject_p.h ../gui/text/qtextodfwriter_p.h ../gui/text/qtexttable_p.h ../gui/text/qzipreader_p.h ../gui/text/qzipwriter_p.h ../gui/itemviews/qabstractitemview_p.h ../gui/itemviews/qabstractproxymodel_p.h ../gui/itemviews/qbsptree_p.h ../gui/itemviews/qcolumnview_p.h ../gui/itemviews/qcolumnviewgrip_p.h ../gui/itemviews/qheaderview_p.h ../gui/itemviews/qitemeditorfactory_p.h ../gui/itemviews/qitemselectionmodel_p.h ../gui/itemviews/qlistview_p.h ../gui/itemviews/qlistwidget_p.h ../gui/itemviews/qproxymodel_p.h ../gui/itemviews/qstandarditemmodel_p.h ../gui/itemviews/qtableview_p.h ../gui/itemviews/qtablewidget_p.h ../gui/itemviews/qtreeview_p.h ../gui/itemviews/qtreewidget_p.h ../gui/itemviews/qtreewidgetitemiterator_p.h ../gui/itemviews/qwidgetitemdata_p.h ../gui/widgets/qabstractbutton_p.h ../gui/widgets/qabstractscrollarea_p.h ../gui/widgets/qabstractslider_p.h ../gui/widgets/qabstractspinbox_p.h ../gui/widgets/qcalendartextnavigator_p.h ../gui/widgets/qcocoamenu_mac_p.h ../gui/widgets/qcocoatoolbardelegate_mac_p.h ../gui/widgets/qcombobox_p.h ../gui/widgets/qdatetimeedit_p.h ../gui/widgets/qdockarealayout_p.h ../gui/widgets/qdockwidget_p.h ../gui/widgets/qeffects_p.h ../gui/widgets/qframe_p.h ../gui/widgets/qlabel_p.h ../gui/widgets/qlinecontrol_p.h ../gui/widgets/qlineedit_p.h ../gui/widgets/qmainwindowlayout_p.h ../gui/widgets/qmdiarea_p.h ../gui/widgets/qmdisubwindow_p.h ../gui/widgets/qmenu_p.h ../gui/widgets/qmenu_wince_resource_p.h ../gui/widgets/qmenubar_p.h ../gui/widgets/qplaintextedit_p.h ../gui/widgets/qpushbutton_p.h ../gui/widgets/qscrollarea_p.h ../gui/widgets/qsplitter_p.h ../gui/widgets/qtabbar_p.h ../gui/widgets/qtextedit_p.h ../gui/widgets/qtoolbar_p.h ../gui/widgets/qtoolbararealayout_p.h ../gui/widgets/qtoolbarextension_p.h ../gui/widgets/qtoolbarlayout_p.h ../gui/widgets/qtoolbarseparator_p.h ../gui/widgets/qwidgetanimator_p.h ../gui/widgets/qwidgetresizehandler_p.h ../gui/statemachine/qbasickeyeventtransition_p.h ../gui/statemachine/qbasicmouseeventtransition_p.h ../gui/util/qcompleter_p.h ../gui/util/qsystemtrayicon_p.h ../gui/util/qundostack_p.h ../gui/accessible/qaccessible_mac_p.h ../gui/styles/qcleanlooksstyle_p.h ../gui/styles/qcommonstyle_p.h ../gui/styles/qcommonstylepixmaps_p.h ../gui/styles/qgtkpainter_p.h ../gui/styles/qgtkstyle_p.h ../gui/styles/qmacstyle_mac_p.h ../gui/styles/qmacstylepixmaps_mac_p.h ../gui/styles/qmotifstyle_p.h ../gui/styles/qproxystyle_p.h ../gui/styles/qs60style_p.h ../gui/styles/qstyle_p.h ../gui/styles/qstylehelper_p.h ../gui/styles/qstylesheetstyle_p.h ../gui/styles/qwindowscestyle_p.h ../gui/styles/qwindowsmobilestyle_p.h ../gui/styles/qwindowsstyle_p.h ../gui/styles/qwindowsvistastyle_p.h ../gui/styles/qwindowsxpstyle_p.h ../gui/egl/qegl_p.h ../gui/egl/qeglcontext_p.h ../gui/egl/qeglproperties_p.h ../gui/inputmethod/qcoefepinputcontext_p.h ../gui/inputmethod/qinputcontext_p.h ../gui/inputmethod/qmacinputcontext_p.h ../gui/inputmethod/qwininputcontext_p.h ../gui/inputmethod/qwsinputcontext_p.h ../gui/inputmethod/qximinputcontext_p.h ../gui/painting/qbackingstore_p.h ../gui/painting/qbezier_p.h ../gui/painting/qblendfunctions_p.h ../gui/painting/qcolor_p.h ../gui/painting/qcssutil_p.h ../gui/painting/qcups_p.h ../gui/painting/qdatabuffer_p.h ../gui/painting/qdrawhelper_arm_simd_p.h ../gui/painting/qdrawhelper_mmx_p.h ../gui/painting/qdrawhelper_neon_p.h ../gui/painting/qdrawhelper_p.h ../gui/painting/qdrawhelper_sse_p.h ../gui/painting/qdrawhelper_x86_p.h ../gui/painting/qdrawingprimitive_sse2_p.h ../gui/painting/qemulationpaintengine_p.h ../gui/painting/qfixed_p.h ../gui/painting/qgraphicssystem_mac_p.h ../gui/painting/qgraphicssystem_p.h ../gui/painting/qgraphicssystem_qws_p.h ../gui/painting/qgraphicssystem_raster_p.h ../gui/painting/qgraphicssystem_runtime_p.h ../gui/painting/qgraphicssystemfactory_p.h ../gui/painting/qgraphicssystemplugin_p.h ../gui/painting/qgrayraster_p.h ../gui/painting/qimagescale_p.h ../gui/painting/qmath_p.h ../gui/painting/qmemrotate_p.h ../gui/painting/qoutlinemapper_p.h ../gui/painting/qpaintbuffer_p.h ../gui/painting/qpaintengine_alpha_p.h ../gui/painting/qpaintengine_mac_p.h ../gui/painting/qpaintengine_p.h ../gui/painting/qpaintengine_preview_p.h ../gui/painting/qpaintengine_raster_p.h ../gui/painting/qpaintengine_s60_p.h ../gui/painting/qpaintengine_x11_p.h ../gui/painting/qpaintengineex_p.h ../gui/painting/qpainter_p.h ../gui/painting/qpainterpath_p.h ../gui/painting/qpathclipper_p.h ../gui/painting/qpdf_p.h ../gui/painting/qpen_p.h ../gui/painting/qpolygonclipper_p.h ../gui/painting/qprintengine_mac_p.h ../gui/painting/qprintengine_pdf_p.h ../gui/painting/qprintengine_ps_p.h ../gui/painting/qprintengine_qws_p.h ../gui/painting/qprintengine_win_p.h ../gui/painting/qprinter_p.h ../gui/painting/qprinterinfo_unix_p.h ../gui/painting/qrasterdefs_p.h ../gui/painting/qrasterizer_p.h ../gui/painting/qstroker_p.h ../gui/painting/qtessellator_p.h ../gui/painting/qtextureglyphcache_p.h ../gui/painting/qvectorpath_p.h ../gui/painting/qwindowsurface_mac_p.h ../gui/painting/qwindowsurface_p.h ../gui/painting/qwindowsurface_pm_p.h ../gui/painting/qwindowsurface_qws_p.h ../gui/painting/qwindowsurface_raster_p.h ../gui/painting/qwindowsurface_s60_p.h ../gui/painting/qwindowsurface_x11_p.h 
Index: trunk/include/QtGui/private/qblendfunctions_p.h
===================================================================
--- trunk/include/QtGui/private/qblendfunctions_p.h	(revision 846)
+++ trunk/include/QtGui/private/qblendfunctions_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/painting/qblendfunctions_p.h"
Index: trunk/include/QtGui/private/qdrawhelper_arm_simd_p.h
===================================================================
--- trunk/include/QtGui/private/qdrawhelper_arm_simd_p.h	(revision 846)
+++ trunk/include/QtGui/private/qdrawhelper_arm_simd_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/painting/qdrawhelper_arm_simd_p.h"
Index: trunk/include/QtGui/private/qdrawhelper_armv6_p.h
===================================================================
--- trunk/include/QtGui/private/qdrawhelper_armv6_p.h	(revision 769)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include "../../../src/gui/painting/qdrawhelper_armv6_p.h"
Index: trunk/include/QtGui/private/qdrawingprimitive_sse2_p.h
===================================================================
--- trunk/include/QtGui/private/qdrawingprimitive_sse2_p.h	(revision 846)
+++ trunk/include/QtGui/private/qdrawingprimitive_sse2_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/painting/qdrawingprimitive_sse2_p.h"
Index: trunk/include/QtGui/private/qeglcontext_p.h
===================================================================
--- trunk/include/QtGui/private/qeglcontext_p.h	(revision 846)
+++ trunk/include/QtGui/private/qeglcontext_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/egl/qeglcontext_p.h"
Index: trunk/include/QtGui/private/qfiledialog_win_p.h
===================================================================
--- trunk/include/QtGui/private/qfiledialog_win_p.h	(revision 846)
+++ trunk/include/QtGui/private/qfiledialog_win_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/dialogs/qfiledialog_win_p.h"
Index: trunk/include/QtGui/private/qgifhandler_p.h
===================================================================
--- trunk/include/QtGui/private/qgifhandler_p.h	(revision 846)
+++ trunk/include/QtGui/private/qgifhandler_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/image/qgifhandler_p.h"
Index: trunk/include/QtGui/private/qgraphicssystem_runtime_p.h
===================================================================
--- trunk/include/QtGui/private/qgraphicssystem_runtime_p.h	(revision 846)
+++ trunk/include/QtGui/private/qgraphicssystem_runtime_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/painting/qgraphicssystem_runtime_p.h"
Index: trunk/include/QtGui/private/qjpeghandler_p.h
===================================================================
--- trunk/include/QtGui/private/qjpeghandler_p.h	(revision 846)
+++ trunk/include/QtGui/private/qjpeghandler_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/image/qjpeghandler_p.h"
Index: trunk/include/QtGui/private/qmacstyle_mac_p.h
===================================================================
--- trunk/include/QtGui/private/qmacstyle_mac_p.h	(revision 846)
+++ trunk/include/QtGui/private/qmacstyle_mac_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/styles/qmacstyle_mac_p.h"
Index: trunk/include/QtGui/private/qmnghandler_p.h
===================================================================
--- trunk/include/QtGui/private/qmnghandler_p.h	(revision 846)
+++ trunk/include/QtGui/private/qmnghandler_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/image/qmnghandler_p.h"
Index: trunk/include/QtGui/private/qstatictext_p.h
===================================================================
--- trunk/include/QtGui/private/qstatictext_p.h	(revision 846)
+++ trunk/include/QtGui/private/qstatictext_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/text/qstatictext_p.h"
Index: trunk/include/QtGui/private/qtiffhandler_p.h
===================================================================
--- trunk/include/QtGui/private/qtiffhandler_p.h	(revision 846)
+++ trunk/include/QtGui/private/qtiffhandler_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/gui/image/qtiffhandler_p.h"
Index: trunk/include/QtGui/qstatictext.h
===================================================================
--- trunk/include/QtGui/qstatictext.h	(revision 846)
+++ trunk/include/QtGui/qstatictext.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/gui/text/qstatictext.h"
Index: trunk/include/QtHelp/headers.pri
===================================================================
--- trunk/include/QtHelp/headers.pri	(revision 769)
+++ trunk/include/QtHelp/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
 SYNCQT.HEADER_FILES = qhelp_global.h qhelpcontentwidget.h qhelpengine.h qhelpenginecore.h qhelpindexwidget.h qhelpsearchengine.h qhelpsearchquerywidget.h qhelpsearchresultwidget.h ../../../include/QtHelp/QtHelp 
 SYNCQT.HEADER_CLASSES = ../../../include/QtHelp/QHelpGlobal ../../../include/QtHelp/QHelpContentItem ../../../include/QtHelp/QHelpContentModel ../../../include/QtHelp/QHelpContentWidget ../../../include/QtHelp/QHelpEngine ../../../include/QtHelp/QHelpEngineCore ../../../include/QtHelp/QHelpIndexModel ../../../include/QtHelp/QHelpIndexWidget ../../../include/QtHelp/QHelpSearchQuery ../../../include/QtHelp/QHelpSearchEngine ../../../include/QtHelp/QHelpSearchQueryWidget ../../../include/QtHelp/QHelpSearchResultWidget 
-SYNCQT.PRIVATE_HEADER_FILES = qhelpcollectionhandler_p.h qhelpdatainterface_p.h qhelpdbreader_p.h qhelpengine_p.h qhelpgenerator_p.h qhelpprojectdata_p.h qhelpsearchindex_default_p.h qhelpsearchindexreader_clucene_p.h qhelpsearchindexreader_default_p.h qhelpsearchindexreader_p.h qhelpsearchindexwriter_clucene_p.h qhelpsearchindexwriter_default_p.h ../lib/fulltextsearch/qanalyzer_p.h ../lib/fulltextsearch/qclucene-config_p.h ../lib/fulltextsearch/qclucene_global_p.h ../lib/fulltextsearch/qdocument_p.h ../lib/fulltextsearch/qfield_p.h ../lib/fulltextsearch/qfilter_p.h ../lib/fulltextsearch/qhits_p.h ../lib/fulltextsearch/qindexreader_p.h ../lib/fulltextsearch/qindexwriter_p.h ../lib/fulltextsearch/qquery_p.h ../lib/fulltextsearch/qqueryparser_p.h ../lib/fulltextsearch/qreader_p.h ../lib/fulltextsearch/qsearchable_p.h ../lib/fulltextsearch/qsort_p.h ../lib/fulltextsearch/qterm_p.h ../lib/fulltextsearch/qtoken_p.h ../lib/fulltextsearch/qtokenizer_p.h ../lib/fulltextsearch/qtokenstream_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = qclucenefieldnames_p.h qhelpcollectionhandler_p.h qhelpdatainterface_p.h qhelpdbreader_p.h qhelpengine_p.h qhelpgenerator_p.h qhelpprojectdata_p.h qhelpsearchindex_default_p.h qhelpsearchindexreader_clucene_p.h qhelpsearchindexreader_default_p.h qhelpsearchindexreader_p.h qhelpsearchindexwriter_clucene_p.h qhelpsearchindexwriter_default_p.h ../lib/fulltextsearch/qanalyzer_p.h ../lib/fulltextsearch/qclucene-config_p.h ../lib/fulltextsearch/qclucene_global_p.h ../lib/fulltextsearch/qdocument_p.h ../lib/fulltextsearch/qfield_p.h ../lib/fulltextsearch/qfilter_p.h ../lib/fulltextsearch/qhits_p.h ../lib/fulltextsearch/qindexreader_p.h ../lib/fulltextsearch/qindexwriter_p.h ../lib/fulltextsearch/qquery_p.h ../lib/fulltextsearch/qqueryparser_p.h ../lib/fulltextsearch/qreader_p.h ../lib/fulltextsearch/qsearchable_p.h ../lib/fulltextsearch/qsort_p.h ../lib/fulltextsearch/qterm_p.h ../lib/fulltextsearch/qtoken_p.h ../lib/fulltextsearch/qtokenizer_p.h ../lib/fulltextsearch/qtokenstream_p.h 
Index: trunk/include/QtHelp/private/qclucenefieldnames_p.h
===================================================================
--- trunk/include/QtHelp/private/qclucenefieldnames_p.h	(revision 846)
+++ trunk/include/QtHelp/private/qclucenefieldnames_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../tools/assistant/lib/qclucenefieldnames_p.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoFenceSync
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoFenceSync	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoFenceSync	(revision 846)
@@ -0,0 +1,1 @@
+#include "qmeegofencesync.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoGraphicsSystemHelper
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoGraphicsSystemHelper	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoGraphicsSystemHelper	(revision 846)
@@ -0,0 +1,1 @@
+#include "qmeegographicssystemhelper.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoLivePixmap
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoLivePixmap	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoLivePixmap	(revision 846)
@@ -0,0 +1,1 @@
+#include "qmeegolivepixmap.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoOverlayWidget
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoOverlayWidget	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoOverlayWidget	(revision 846)
@@ -0,0 +1,1 @@
+#include "qmeegooverlaywidget.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoRuntime
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoRuntime	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoRuntime	(revision 846)
@@ -0,0 +1,1 @@
+#include "qmeegoruntime.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoSwitchEvent
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoSwitchEvent	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QMeeGoSwitchEvent	(revision 846)
@@ -0,0 +1,1 @@
+#include "qmeegoswitchevent.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/QtMeeGoGraphicsSystemHelper
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/QtMeeGoGraphicsSystemHelper	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/QtMeeGoGraphicsSystemHelper	(revision 846)
@@ -0,0 +1,11 @@
+#ifndef QT_QTMEEGOGRAPHICSSYSTEMHELPER_MODULE_H
+#define QT_QTMEEGOGRAPHICSSYSTEMHELPER_MODULE_H
+#include <QtGui/QtGui>
+#include <QtOpenGL/QtOpenGL>
+#include "qmeegofencesync.h"
+#include "qmeegographicssystemhelper.h"
+#include "qmeegolivepixmap.h"
+#include "qmeegooverlaywidget.h"
+#include "qmeegoruntime.h"
+#include "qmeegoswitchevent.h"
+#endif
Index: trunk/include/QtMeeGoGraphicsSystemHelper/headers.pri
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/headers.pri	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/headers.pri	(revision 846)
@@ -0,0 +1,3 @@
+SYNCQT.HEADER_FILES = qmeegofencesync.h qmeegographicssystemhelper.h qmeegolivepixmap.h qmeegooverlaywidget.h qmeegoruntime.h qmeegoswitchevent.h ../../include/QtMeeGoGraphicsSystemHelper/QtMeeGoGraphicsSystemHelper 
+SYNCQT.HEADER_CLASSES = ../../include/QtMeeGoGraphicsSystemHelper/QMeeGoFenceSync ../../include/QtMeeGoGraphicsSystemHelper/QMeeGoGraphicsSystemHelper ../../include/QtMeeGoGraphicsSystemHelper/QMeeGoLivePixmap ../../include/QtMeeGoGraphicsSystemHelper/QMeeGoOverlayWidget ../../include/QtMeeGoGraphicsSystemHelper/QMeeGoRuntime ../../include/QtMeeGoGraphicsSystemHelper/QMeeGoSwitchEvent 
+SYNCQT.PRIVATE_HEADER_FILES = qmeegofencesync_p.h qmeegolivepixmap_p.h 
Index: trunk/include/QtMeeGoGraphicsSystemHelper/private/qmeegofencesync_p.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/private/qmeegofencesync_p.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/private/qmeegofencesync_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../tools/qmeegographicssystemhelper/qmeegofencesync_p.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/private/qmeegolivepixmap_p.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/private/qmeegolivepixmap_p.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/private/qmeegolivepixmap_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../tools/qmeegographicssystemhelper/qmeegolivepixmap_p.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/qmeegofencesync.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/qmeegofencesync.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/qmeegofencesync.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../tools/qmeegographicssystemhelper/qmeegofencesync.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/qmeegographicssystemhelper.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/qmeegographicssystemhelper.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/qmeegographicssystemhelper.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/qmeegolivepixmap.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/qmeegolivepixmap.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/qmeegolivepixmap.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../tools/qmeegographicssystemhelper/qmeegolivepixmap.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/qmeegooverlaywidget.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/qmeegooverlaywidget.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/qmeegooverlaywidget.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../tools/qmeegographicssystemhelper/qmeegooverlaywidget.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/qmeegoruntime.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/qmeegoruntime.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/qmeegoruntime.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../tools/qmeegographicssystemhelper/qmeegoruntime.h"
Index: trunk/include/QtMeeGoGraphicsSystemHelper/qmeegoswitchevent.h
===================================================================
--- trunk/include/QtMeeGoGraphicsSystemHelper/qmeegoswitchevent.h	(revision 846)
+++ trunk/include/QtMeeGoGraphicsSystemHelper/qmeegoswitchevent.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../tools/qmeegographicssystemhelper/qmeegoswitchevent.h"
Index: trunk/include/QtNetwork/QNetworkConfiguration
===================================================================
--- trunk/include/QtNetwork/QNetworkConfiguration	(revision 846)
+++ trunk/include/QtNetwork/QNetworkConfiguration	(revision 846)
@@ -0,0 +1,1 @@
+#include "qnetworkconfiguration.h"
Index: trunk/include/QtNetwork/QNetworkConfigurationManager
===================================================================
--- trunk/include/QtNetwork/QNetworkConfigurationManager	(revision 846)
+++ trunk/include/QtNetwork/QNetworkConfigurationManager	(revision 846)
@@ -0,0 +1,1 @@
+#include "qnetworkconfigmanager.h"
Index: trunk/include/QtNetwork/QNetworkSession
===================================================================
--- trunk/include/QtNetwork/QNetworkSession	(revision 846)
+++ trunk/include/QtNetwork/QNetworkSession	(revision 846)
@@ -0,0 +1,1 @@
+#include "qnetworksession.h"
Index: trunk/include/QtNetwork/QtNetwork
===================================================================
--- trunk/include/QtNetwork/QtNetwork	(revision 769)
+++ trunk/include/QtNetwork/QtNetwork	(revision 846)
@@ -2,4 +2,13 @@
 #define QT_QTNETWORK_MODULE_H
 #include <QtCore/QtCore>
+#include "qauthenticator.h"
+#include "qhostaddress.h"
+#include "qhostinfo.h"
+#include "qnetworkinterface.h"
+#include "qnetworkproxy.h"
+#include "qurlinfo.h"
+#include "qnetworkconfigmanager.h"
+#include "qnetworkconfiguration.h"
+#include "qnetworksession.h"
 #include "qabstractnetworkcache.h"
 #include "qftp.h"
@@ -11,10 +20,4 @@
 #include "qnetworkreply.h"
 #include "qnetworkrequest.h"
-#include "qauthenticator.h"
-#include "qhostaddress.h"
-#include "qhostinfo.h"
-#include "qnetworkinterface.h"
-#include "qnetworkproxy.h"
-#include "qurlinfo.h"
 #include "qabstractsocket.h"
 #include "qlocalserver.h"
Index: trunk/include/QtNetwork/headers.pri
===================================================================
--- trunk/include/QtNetwork/headers.pri	(revision 769)
+++ trunk/include/QtNetwork/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../network/access/qabstractnetworkcache.h ../network/access/qftp.h ../network/access/qhttp.h ../network/access/qnetworkaccessmanager.h ../network/access/qnetworkcookie.h ../network/access/qnetworkcookiejar.h ../network/access/qnetworkdiskcache.h ../network/access/qnetworkreply.h ../network/access/qnetworkrequest.h ../network/kernel/qauthenticator.h ../network/kernel/qhostaddress.h ../network/kernel/qhostinfo.h ../network/kernel/qnetworkinterface.h ../network/kernel/qnetworkproxy.h ../network/kernel/qurlinfo.h ../network/socket/qabstractsocket.h ../network/socket/qlocalserver.h ../network/socket/qlocalsocket.h ../network/socket/qtcpserver.h ../network/socket/qtcpsocket.h ../network/socket/qudpsocket.h ../network/ssl/qssl.h ../network/ssl/qsslcertificate.h ../network/ssl/qsslcipher.h ../network/ssl/qsslconfiguration.h ../network/ssl/qsslerror.h ../network/ssl/qsslkey.h ../network/ssl/qsslsocket.h ../../include/QtNetwork/QtNetwork 
-SYNCQT.HEADER_CLASSES = ../../include/QtNetwork/QNetworkCacheMetaData ../../include/QtNetwork/QAbstractNetworkCache ../../include/QtNetwork/QFtp ../../include/QtNetwork/QHttpHeader ../../include/QtNetwork/QHttpResponseHeader ../../include/QtNetwork/QHttpRequestHeader ../../include/QtNetwork/QHttp ../../include/QtNetwork/QNetworkAccessManager ../../include/QtNetwork/QNetworkCookie ../../include/QtNetwork/QNetworkCookieJar ../../include/QtNetwork/QNetworkDiskCache ../../include/QtNetwork/QNetworkReply ../../include/QtNetwork/QNetworkRequest ../../include/QtNetwork/QAuthenticator ../../include/QtNetwork/QIPv6Address ../../include/QtNetwork/Q_IPV6ADDR ../../include/QtNetwork/QHostAddress ../../include/QtNetwork/QHostInfo ../../include/QtNetwork/QNetworkAddressEntry ../../include/QtNetwork/QNetworkInterface ../../include/QtNetwork/QNetworkProxyQuery ../../include/QtNetwork/QNetworkProxy ../../include/QtNetwork/QNetworkProxyFactory ../../include/QtNetwork/QUrlInfo ../../include/QtNetwork/QAbstractSocket ../../include/QtNetwork/QLocalServer ../../include/QtNetwork/QLocalSocket ../../include/QtNetwork/QTcpServer ../../include/QtNetwork/QTcpSocket ../../include/QtNetwork/QUdpSocket ../../include/QtNetwork/QSsl ../../include/QtNetwork/QSslCertificate ../../include/QtNetwork/QSslCipher ../../include/QtNetwork/QSslConfiguration ../../include/QtNetwork/QSslError ../../include/QtNetwork/QSslKey ../../include/QtNetwork/QSslSocket 
-SYNCQT.PRIVATE_HEADER_FILES = ../network/access/qabstractnetworkcache_p.h ../network/access/qfilenetworkreply_p.h ../network/access/qhttpnetworkconnection_p.h ../network/access/qhttpnetworkconnectionchannel_p.h ../network/access/qhttpnetworkheader_p.h ../network/access/qhttpnetworkreply_p.h ../network/access/qhttpnetworkrequest_p.h ../network/access/qnetworkaccessbackend_p.h ../network/access/qnetworkaccesscache_p.h ../network/access/qnetworkaccesscachebackend_p.h ../network/access/qnetworkaccessdatabackend_p.h ../network/access/qnetworkaccessdebugpipebackend_p.h ../network/access/qnetworkaccessfilebackend_p.h ../network/access/qnetworkaccessftpbackend_p.h ../network/access/qnetworkaccesshttpbackend_p.h ../network/access/qnetworkaccessmanager_p.h ../network/access/qnetworkcookie_p.h ../network/access/qnetworkcookiejar_p.h ../network/access/qnetworkdiskcache_p.h ../network/access/qnetworkreply_p.h ../network/access/qnetworkreplyimpl_p.h ../network/access/qnetworkrequest_p.h ../network/kernel/qauthenticator_p.h ../network/kernel/qhostaddress_p.h ../network/kernel/qhostinfo_p.h ../network/kernel/qnetworkinterface_p.h ../network/kernel/qnetworkinterface_win_p.h ../network/kernel/qnetworkproxy_p.h ../network/socket/qabstractsocket_p.h ../network/socket/qabstractsocketengine_p.h ../network/socket/qhttpsocketengine_p.h ../network/socket/qlocalserver_p.h ../network/socket/qlocalsocket_p.h ../network/socket/qnativesocketengine_p.h ../network/socket/qnet_unix_p.h ../network/socket/qsocks5socketengine_p.h ../network/socket/qtcpsocket_p.h ../network/ssl/qsslcertificate_p.h ../network/ssl/qsslcipher_p.h ../network/ssl/qsslconfiguration_p.h ../network/ssl/qsslkey_p.h ../network/ssl/qsslsocket_openssl_p.h ../network/ssl/qsslsocket_openssl_symbols_p.h ../network/ssl/qsslsocket_p.h 
+SYNCQT.HEADER_FILES = ../network/kernel/qauthenticator.h ../network/kernel/qhostaddress.h ../network/kernel/qhostinfo.h ../network/kernel/qnetworkinterface.h ../network/kernel/qnetworkproxy.h ../network/kernel/qurlinfo.h ../network/bearer/qnetworkconfigmanager.h ../network/bearer/qnetworkconfiguration.h ../network/bearer/qnetworksession.h ../network/access/qabstractnetworkcache.h ../network/access/qftp.h ../network/access/qhttp.h ../network/access/qnetworkaccessmanager.h ../network/access/qnetworkcookie.h ../network/access/qnetworkcookiejar.h ../network/access/qnetworkdiskcache.h ../network/access/qnetworkreply.h ../network/access/qnetworkrequest.h ../network/socket/qabstractsocket.h ../network/socket/qlocalserver.h ../network/socket/qlocalsocket.h ../network/socket/qtcpserver.h ../network/socket/qtcpsocket.h ../network/socket/qudpsocket.h ../network/ssl/qssl.h ../network/ssl/qsslcertificate.h ../network/ssl/qsslcipher.h ../network/ssl/qsslconfiguration.h ../network/ssl/qsslerror.h ../network/ssl/qsslkey.h ../network/ssl/qsslsocket.h ../../include/QtNetwork/QtNetwork 
+SYNCQT.HEADER_CLASSES = ../../include/QtNetwork/QAuthenticator ../../include/QtNetwork/QIPv6Address ../../include/QtNetwork/Q_IPV6ADDR ../../include/QtNetwork/QHostAddress ../../include/QtNetwork/QHostInfo ../../include/QtNetwork/QNetworkAddressEntry ../../include/QtNetwork/QNetworkInterface ../../include/QtNetwork/QNetworkProxyQuery ../../include/QtNetwork/QNetworkProxy ../../include/QtNetwork/QNetworkProxyFactory ../../include/QtNetwork/QUrlInfo ../../include/QtNetwork/QNetworkConfigurationManager ../../include/QtNetwork/QNetworkConfiguration ../../include/QtNetwork/QNetworkSession ../../include/QtNetwork/QNetworkCacheMetaData ../../include/QtNetwork/QAbstractNetworkCache ../../include/QtNetwork/QFtp ../../include/QtNetwork/QHttpHeader ../../include/QtNetwork/QHttpResponseHeader ../../include/QtNetwork/QHttpRequestHeader ../../include/QtNetwork/QHttp ../../include/QtNetwork/QNetworkAccessManager ../../include/QtNetwork/QNetworkCookie ../../include/QtNetwork/QNetworkCookieJar ../../include/QtNetwork/QNetworkDiskCache ../../include/QtNetwork/QNetworkReply ../../include/QtNetwork/QNetworkRequest ../../include/QtNetwork/QAbstractSocket ../../include/QtNetwork/QLocalServer ../../include/QtNetwork/QLocalSocket ../../include/QtNetwork/QTcpServer ../../include/QtNetwork/QTcpSocket ../../include/QtNetwork/QUdpSocket ../../include/QtNetwork/QSsl ../../include/QtNetwork/QSslCertificate ../../include/QtNetwork/QSslCipher ../../include/QtNetwork/QSslConfiguration ../../include/QtNetwork/QSslError ../../include/QtNetwork/QSslKey ../../include/QtNetwork/QSslSocket 
+SYNCQT.PRIVATE_HEADER_FILES = ../network/kernel/qauthenticator_p.h ../network/kernel/qhostaddress_p.h ../network/kernel/qhostinfo_p.h ../network/kernel/qnetworkinterface_p.h ../network/kernel/qnetworkinterface_win_p.h ../network/kernel/qnetworkproxy_p.h ../network/bearer/qbearerengine_p.h ../network/bearer/qbearerplugin_p.h ../network/bearer/qnetworkconfigmanager_p.h ../network/bearer/qnetworkconfiguration_p.h ../network/bearer/qnetworksession_p.h ../network/bearer/qsharednetworksession_p.h ../network/access/qabstractnetworkcache_p.h ../network/access/qfilenetworkreply_p.h ../network/access/qhttpnetworkconnection_p.h ../network/access/qhttpnetworkconnectionchannel_p.h ../network/access/qhttpnetworkheader_p.h ../network/access/qhttpnetworkreply_p.h ../network/access/qhttpnetworkrequest_p.h ../network/access/qnetworkaccessbackend_p.h ../network/access/qnetworkaccesscache_p.h ../network/access/qnetworkaccesscachebackend_p.h ../network/access/qnetworkaccessdatabackend_p.h ../network/access/qnetworkaccessdebugpipebackend_p.h ../network/access/qnetworkaccessfilebackend_p.h ../network/access/qnetworkaccessftpbackend_p.h ../network/access/qnetworkaccesshttpbackend_p.h ../network/access/qnetworkaccessmanager_p.h ../network/access/qnetworkcookie_p.h ../network/access/qnetworkcookiejar_p.h ../network/access/qnetworkcookiejartlds_p.h ../network/access/qnetworkdiskcache_p.h ../network/access/qnetworkreply_p.h ../network/access/qnetworkreplyimpl_p.h ../network/access/qnetworkrequest_p.h ../network/socket/qabstractsocket_p.h ../network/socket/qabstractsocketengine_p.h ../network/socket/qhttpsocketengine_p.h ../network/socket/qlocalserver_p.h ../network/socket/qlocalsocket_p.h ../network/socket/qnativesocketengine_p.h ../network/socket/qnet_unix_p.h ../network/socket/qsocks5socketengine_p.h ../network/socket/qtcpsocket_p.h ../network/ssl/qsslcertificate_p.h ../network/ssl/qsslcipher_p.h ../network/ssl/qsslconfiguration_p.h ../network/ssl/qsslkey_p.h ../network/ssl/qsslsocket_openssl_p.h ../network/ssl/qsslsocket_openssl_symbols_p.h ../network/ssl/qsslsocket_p.h 
Index: trunk/include/QtNetwork/private/qbearerengine_p.h
===================================================================
--- trunk/include/QtNetwork/private/qbearerengine_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qbearerengine_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/bearer/qbearerengine_p.h"
Index: trunk/include/QtNetwork/private/qbearerplugin_p.h
===================================================================
--- trunk/include/QtNetwork/private/qbearerplugin_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qbearerplugin_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/bearer/qbearerplugin_p.h"
Index: trunk/include/QtNetwork/private/qnetworkconfigmanager_p.h
===================================================================
--- trunk/include/QtNetwork/private/qnetworkconfigmanager_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qnetworkconfigmanager_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/bearer/qnetworkconfigmanager_p.h"
Index: trunk/include/QtNetwork/private/qnetworkconfiguration_p.h
===================================================================
--- trunk/include/QtNetwork/private/qnetworkconfiguration_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qnetworkconfiguration_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/bearer/qnetworkconfiguration_p.h"
Index: trunk/include/QtNetwork/private/qnetworkcookiejartlds_p.h
===================================================================
--- trunk/include/QtNetwork/private/qnetworkcookiejartlds_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qnetworkcookiejartlds_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/access/qnetworkcookiejartlds_p.h"
Index: trunk/include/QtNetwork/private/qnetworksession_p.h
===================================================================
--- trunk/include/QtNetwork/private/qnetworksession_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qnetworksession_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/bearer/qnetworksession_p.h"
Index: trunk/include/QtNetwork/private/qsharednetworksession_p.h
===================================================================
--- trunk/include/QtNetwork/private/qsharednetworksession_p.h	(revision 846)
+++ trunk/include/QtNetwork/private/qsharednetworksession_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/network/bearer/qsharednetworksession_p.h"
Index: trunk/include/QtNetwork/qnetworkconfigmanager.h
===================================================================
--- trunk/include/QtNetwork/qnetworkconfigmanager.h	(revision 846)
+++ trunk/include/QtNetwork/qnetworkconfigmanager.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/network/bearer/qnetworkconfigmanager.h"
Index: trunk/include/QtNetwork/qnetworkconfiguration.h
===================================================================
--- trunk/include/QtNetwork/qnetworkconfiguration.h	(revision 846)
+++ trunk/include/QtNetwork/qnetworkconfiguration.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/network/bearer/qnetworkconfiguration.h"
Index: trunk/include/QtNetwork/qnetworksession.h
===================================================================
--- trunk/include/QtNetwork/qnetworksession.h	(revision 846)
+++ trunk/include/QtNetwork/qnetworksession.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/network/bearer/qnetworksession.h"
Index: trunk/include/QtOpenGL/QGLBuffer
===================================================================
--- trunk/include/QtOpenGL/QGLBuffer	(revision 846)
+++ trunk/include/QtOpenGL/QGLBuffer	(revision 846)
@@ -0,0 +1,1 @@
+#include "qglbuffer.h"
Index: trunk/include/QtOpenGL/QtOpenGL
===================================================================
--- trunk/include/QtOpenGL/QtOpenGL	(revision 769)
+++ trunk/include/QtOpenGL/QtOpenGL	(revision 846)
@@ -4,4 +4,5 @@
 #include <QtGui/QtGui>
 #include "qgl.h"
+#include "qglbuffer.h"
 #include "qglcolormap.h"
 #include "qglframebufferobject.h"
Index: trunk/include/QtOpenGL/headers.pri
===================================================================
--- trunk/include/QtOpenGL/headers.pri	(revision 769)
+++ trunk/include/QtOpenGL/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = qgl.h qglcolormap.h qglframebufferobject.h qglpixelbuffer.h qglscreen_qws.h qglshaderprogram.h ../../include/QtOpenGL/QtOpenGL 
-SYNCQT.HEADER_CLASSES = ../../include/QtOpenGL/QMacGLCompatTypes ../../include/QtOpenGL/QMacCompatGLint ../../include/QtOpenGL/QMacCompatGLuint ../../include/QtOpenGL/QMacCompatGLenum ../../include/QtOpenGL/QGLFormat ../../include/QtOpenGL/QGLContext ../../include/QtOpenGL/QGLWidget ../../include/QtOpenGL/QGLColormap ../../include/QtOpenGL/QGLFramebufferObject ../../include/QtOpenGL/QGLFramebufferObjectFormat ../../include/QtOpenGL/QGLPixelBuffer ../../include/QtOpenGL/QGLScreenSurfaceFunctions ../../include/QtOpenGL/QGLScreen ../../include/QtOpenGL/QGLShader ../../include/QtOpenGL/QGLShaderProgram 
-SYNCQT.PRIVATE_HEADER_FILES = qgl_cl_p.h qgl_egl_p.h qgl_p.h qglextensions_p.h qglframebufferobject_p.h qglpaintdevice_p.h qglpixelbuffer_p.h qglpixmapfilter_p.h qglwindowsurface_qws_p.h qgraphicsshadereffect_p.h qgraphicssystem_gl_p.h qpaintengine_opengl_p.h qpixmapdata_gl_p.h qpixmapdata_x11gl_p.h qwindowsurface_gl_p.h qwindowsurface_x11gl_p.h ../opengl/gl2paintengineex/qgl2pexvertexarray_p.h ../opengl/gl2paintengineex/qglcustomshaderstage_p.h ../opengl/gl2paintengineex/qglengineshadermanager_p.h ../opengl/gl2paintengineex/qglengineshadersource_p.h ../opengl/gl2paintengineex/qglgradientcache_p.h ../opengl/gl2paintengineex/qpaintengineex_opengl2_p.h ../opengl/gl2paintengineex/qtextureglyphcache_gl_p.h ../opengl/gl2paintengineex/qtriangulatingstroker_p.h ../opengl/util/fragmentprograms_p.h 
+SYNCQT.HEADER_FILES = qgl.h qglbuffer.h qglcolormap.h qglframebufferobject.h qglpixelbuffer.h qglscreen_qws.h qglshaderprogram.h ../../include/QtOpenGL/QtOpenGL 
+SYNCQT.HEADER_CLASSES = ../../include/QtOpenGL/QMacGLCompatTypes ../../include/QtOpenGL/QMacCompatGLint ../../include/QtOpenGL/QMacCompatGLuint ../../include/QtOpenGL/QMacCompatGLenum ../../include/QtOpenGL/QGLFormat ../../include/QtOpenGL/QGLContext ../../include/QtOpenGL/QGLWidget ../../include/QtOpenGL/QGLBuffer ../../include/QtOpenGL/QGLColormap ../../include/QtOpenGL/QGLFramebufferObject ../../include/QtOpenGL/QGLFramebufferObjectFormat ../../include/QtOpenGL/QGLPixelBuffer ../../include/QtOpenGL/QGLScreenSurfaceFunctions ../../include/QtOpenGL/QGLScreen ../../include/QtOpenGL/QGLShader ../../include/QtOpenGL/QGLShaderProgram 
+SYNCQT.PRIVATE_HEADER_FILES = qgl_egl_p.h qgl_p.h qglextensions_p.h qglframebufferobject_p.h qglpaintdevice_p.h qglpixelbuffer_p.h qglpixmapfilter_p.h qglwindowsurface_qws_p.h qgraphicsshadereffect_p.h qgraphicssystem_gl_p.h qpaintengine_opengl_p.h qpixmapdata_gl_p.h qpixmapdata_x11gl_p.h qwindowsurface_gl_p.h qwindowsurface_x11gl_p.h ../opengl/gl2paintengineex/qgl2pexvertexarray_p.h ../opengl/gl2paintengineex/qglcustomshaderstage_p.h ../opengl/gl2paintengineex/qglengineshadermanager_p.h ../opengl/gl2paintengineex/qglengineshadersource_p.h ../opengl/gl2paintengineex/qglgradientcache_p.h ../opengl/gl2paintengineex/qpaintengineex_opengl2_p.h ../opengl/gl2paintengineex/qtextureglyphcache_gl_p.h ../opengl/gl2paintengineex/qtriangulatingstroker_p.h ../opengl/gl2paintengineex/qtriangulator_p.h ../opengl/util/fragmentprograms_p.h 
Index: trunk/include/QtOpenGL/private/qgl_cl_p.h
===================================================================
--- trunk/include/QtOpenGL/private/qgl_cl_p.h	(revision 769)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include "../../../src/opengl/qgl_cl_p.h"
Index: trunk/include/QtOpenGL/private/qtriangulator_p.h
===================================================================
--- trunk/include/QtOpenGL/private/qtriangulator_p.h	(revision 846)
+++ trunk/include/QtOpenGL/private/qtriangulator_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/opengl/gl2paintengineex/qtriangulator_p.h"
Index: trunk/include/QtOpenGL/qglbuffer.h
===================================================================
--- trunk/include/QtOpenGL/qglbuffer.h	(revision 846)
+++ trunk/include/QtOpenGL/qglbuffer.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/opengl/qglbuffer.h"
Index: trunk/include/QtOpenVG/headers.pri
===================================================================
--- trunk/include/QtOpenVG/headers.pri	(revision 769)
+++ trunk/include/QtOpenVG/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
 SYNCQT.HEADER_FILES = qvg.h ../../include/QtOpenVG/QtOpenVG 
 SYNCQT.HEADER_CLASSES = 
-SYNCQT.PRIVATE_HEADER_FILES = qpaintengine_vg_p.h qpixmapdata_vg_p.h qpixmapfilter_vg_p.h qvg_p.h qvgcompositionhelper_p.h qvgimagepool_p.h qwindowsurface_vg_p.h qwindowsurface_vgegl_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = qpaintengine_vg_p.h qpixmapdata_vg_p.h qpixmapfilter_vg_p.h qvg_p.h qvgcompositionhelper_p.h qvgfontglyphcache_p.h qvgimagepool_p.h qwindowsurface_vg_p.h qwindowsurface_vgegl_p.h 
Index: trunk/include/QtOpenVG/private/qvgfontglyphcache_p.h
===================================================================
--- trunk/include/QtOpenVG/private/qvgfontglyphcache_p.h	(revision 846)
+++ trunk/include/QtOpenVG/private/qvgfontglyphcache_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/openvg/qvgfontglyphcache_p.h"
Index: trunk/include/QtScript/headers.pri
===================================================================
--- trunk/include/QtScript/headers.pri	(revision 769)
+++ trunk/include/QtScript/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
 SYNCQT.HEADER_FILES = ../script/api/qscriptable.h ../script/api/qscriptclass.h ../script/api/qscriptclasspropertyiterator.h ../script/api/qscriptcontext.h ../script/api/qscriptcontextinfo.h ../script/api/qscriptengine.h ../script/api/qscriptengineagent.h ../script/api/qscriptextensioninterface.h ../script/api/qscriptextensionplugin.h ../script/api/qscriptprogram.h ../script/api/qscriptstring.h ../script/api/qscriptvalue.h ../script/api/qscriptvalueiterator.h ../../include/QtScript/QtScript 
 SYNCQT.HEADER_CLASSES = ../../include/QtScript/QScriptable ../../include/QtScript/QScriptClass ../../include/QtScript/QScriptClassPropertyIterator ../../include/QtScript/QScriptContext ../../include/QtScript/QScriptContextInfo ../../include/QtScript/QScriptContextInfoList ../../include/QtScript/QScriptSyntaxCheckResult ../../include/QtScript/QScriptEngine ../../include/QtScript/QScriptEngineAgent ../../include/QtScript/QScriptExtensionInterface ../../include/QtScript/QScriptExtensionPlugin ../../include/QtScript/QScriptProgram ../../include/QtScript/QScriptString ../../include/QtScript/QScriptValueList ../../include/QtScript/QScriptValue ../../include/QtScript/QScriptValueIterator 
-SYNCQT.PRIVATE_HEADER_FILES = ../script/api/qscriptable_p.h ../script/api/qscriptcontext_p.h ../script/api/qscriptengine_p.h ../script/api/qscriptengineagent_p.h ../script/api/qscriptprogram_p.h ../script/api/qscriptstring_p.h ../script/api/qscriptvalue_p.h ../script/bridge/qscriptactivationobject_p.h ../script/bridge/qscriptclassobject_p.h ../script/bridge/qscriptdeclarativeclass_p.h ../script/bridge/qscriptdeclarativeobject_p.h ../script/bridge/qscriptfunction_p.h ../script/bridge/qscriptglobalobject_p.h ../script/bridge/qscriptobject_p.h ../script/bridge/qscriptqobject_p.h ../script/bridge/qscriptvariant_p.h ../script/parser/qscriptast_p.h ../script/parser/qscriptastfwd_p.h ../script/parser/qscriptastvisitor_p.h ../script/parser/qscriptgrammar_p.h ../script/parser/qscriptlexer_p.h ../script/parser/qscriptparser_p.h ../script/parser/qscriptsyntaxchecker_p.h ../script/utils/qscriptdate_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = ../script/api/qscriptable_p.h ../script/api/qscriptcontext_p.h ../script/api/qscriptengine_p.h ../script/api/qscriptengineagent_p.h ../script/api/qscriptprogram_p.h ../script/api/qscriptstring_p.h ../script/api/qscriptvalue_p.h ../script/bridge/qscriptactivationobject_p.h ../script/bridge/qscriptclassobject_p.h ../script/bridge/qscriptdeclarativeclass_p.h ../script/bridge/qscriptdeclarativeobject_p.h ../script/bridge/qscriptfunction_p.h ../script/bridge/qscriptglobalobject_p.h ../script/bridge/qscriptobject_p.h ../script/bridge/qscriptqobject_p.h ../script/bridge/qscriptstaticscopeobject_p.h ../script/bridge/qscriptvariant_p.h ../script/parser/qscriptast_p.h ../script/parser/qscriptastfwd_p.h ../script/parser/qscriptastvisitor_p.h ../script/parser/qscriptgrammar_p.h ../script/parser/qscriptlexer_p.h ../script/parser/qscriptparser_p.h ../script/parser/qscriptsyntaxchecker_p.h 
Index: trunk/include/QtScript/private/qscriptdate_p.h
===================================================================
--- trunk/include/QtScript/private/qscriptdate_p.h	(revision 769)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include "../../../src/script/utils/qscriptdate_p.h"
Index: trunk/include/QtScript/private/qscriptstaticscopeobject_p.h
===================================================================
--- trunk/include/QtScript/private/qscriptstaticscopeobject_p.h	(revision 846)
+++ trunk/include/QtScript/private/qscriptstaticscopeobject_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/script/bridge/qscriptstaticscopeobject_p.h"
Index: trunk/include/QtSql/headers.pri
===================================================================
--- trunk/include/QtSql/headers.pri	(revision 769)
+++ trunk/include/QtSql/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../sql/kernel/qsql.h ../sql/kernel/qsqldatabase.h ../sql/kernel/qsqldriver.h ../sql/kernel/qsqldriverplugin.h ../sql/kernel/qsqlerror.h ../sql/kernel/qsqlfield.h ../sql/kernel/qsqlindex.h ../sql/kernel/qsqlquery.h ../sql/kernel/qsqlrecord.h ../sql/kernel/qsqlresult.h ../sql/models/qsqlquerymodel.h ../sql/models/qsqlrelationaldelegate.h ../sql/models/qsqlrelationaltablemodel.h ../sql/models/qsqltablemodel.h ../sql/drivers/sqlite2/qsql_sqlite2.h ../sql/drivers/odbc/qsql_odbc.h ../sql/drivers/tds/qsql_tds.h ../sql/drivers/ibase/qsql_ibase.h ../sql/drivers/sqlite/qsql_sqlite.h ../sql/drivers/mysql/qsql_mysql.h ../sql/drivers/psql/qsql_psql.h ../sql/drivers/oci/qsql_oci.h ../sql/drivers/db2/qsql_db2.h ../../include/QtSql/QtSql 
-SYNCQT.HEADER_CLASSES = ../../include/QtSql/QSqlDriverCreatorBase ../../include/QtSql/QSqlDriverCreator ../../include/QtSql/QSqlDatabase ../../include/QtSql/QSqlDriver ../../include/QtSql/QSqlDriverFactoryInterface ../../include/QtSql/QSqlDriverPlugin ../../include/QtSql/QSqlError ../../include/QtSql/QSqlField ../../include/QtSql/QSqlIndex ../../include/QtSql/QSqlQuery ../../include/QtSql/QSqlRecord ../../include/QtSql/QSqlResult ../../include/QtSql/QSqlQueryModel ../../include/QtSql/QSqlRelationalDelegate ../../include/QtSql/QSqlRelation ../../include/QtSql/QSqlRelationalTableModel ../../include/QtSql/QSqlTableModel ../../include/QtSql/QSQLite2Result ../../include/QtSql/QSQLite2Driver ../../include/QtSql/QODBCResult ../../include/QtSql/QODBCDriver ../../include/QtSql/QTDSResult ../../include/QtSql/QTDSDriver ../../include/QtSql/QIBaseResult ../../include/QtSql/QIBaseDriver ../../include/QtSql/QSQLiteResult ../../include/QtSql/QSQLiteDriver ../../include/QtSql/QMYSQLResult ../../include/QtSql/QMYSQLDriver ../../include/QtSql/QPSQLResult ../../include/QtSql/QPSQLDriver ../../include/QtSql/QOCIResult ../../include/QtSql/QOCIDriver ../../include/QtSql/QDB2Result ../../include/QtSql/QDB2Driver 
+SYNCQT.HEADER_FILES = ../sql/kernel/qsql.h ../sql/kernel/qsqldatabase.h ../sql/kernel/qsqldriver.h ../sql/kernel/qsqldriverplugin.h ../sql/kernel/qsqlerror.h ../sql/kernel/qsqlfield.h ../sql/kernel/qsqlindex.h ../sql/kernel/qsqlquery.h ../sql/kernel/qsqlrecord.h ../sql/kernel/qsqlresult.h ../sql/models/qsqlquerymodel.h ../sql/models/qsqlrelationaldelegate.h ../sql/models/qsqlrelationaltablemodel.h ../sql/models/qsqltablemodel.h ../sql/drivers/tds/qsql_tds.h ../sql/drivers/sqlite2/qsql_sqlite2.h ../sql/drivers/sqlite/qsql_sqlite.h ../sql/drivers/psql/qsql_psql.h ../sql/drivers/oci/qsql_oci.h ../sql/drivers/ibase/qsql_ibase.h ../sql/drivers/odbc/qsql_odbc.h ../sql/drivers/db2/qsql_db2.h ../sql/drivers/mysql/qsql_mysql.h ../../include/QtSql/QtSql 
+SYNCQT.HEADER_CLASSES = ../../include/QtSql/QSqlDriverCreatorBase ../../include/QtSql/QSqlDriverCreator ../../include/QtSql/QSqlDatabase ../../include/QtSql/QSqlDriver ../../include/QtSql/QSqlDriverFactoryInterface ../../include/QtSql/QSqlDriverPlugin ../../include/QtSql/QSqlError ../../include/QtSql/QSqlField ../../include/QtSql/QSqlIndex ../../include/QtSql/QSqlQuery ../../include/QtSql/QSqlRecord ../../include/QtSql/QSqlResult ../../include/QtSql/QSqlQueryModel ../../include/QtSql/QSqlRelationalDelegate ../../include/QtSql/QSqlRelation ../../include/QtSql/QSqlRelationalTableModel ../../include/QtSql/QSqlTableModel ../../include/QtSql/QTDSResult ../../include/QtSql/QTDSDriver ../../include/QtSql/QSQLite2Result ../../include/QtSql/QSQLite2Driver ../../include/QtSql/QSQLiteResult ../../include/QtSql/QSQLiteDriver ../../include/QtSql/QPSQLResult ../../include/QtSql/QPSQLDriver ../../include/QtSql/QOCIResult ../../include/QtSql/QOCIDriver ../../include/QtSql/QIBaseResult ../../include/QtSql/QIBaseDriver ../../include/QtSql/QODBCResult ../../include/QtSql/QODBCDriver ../../include/QtSql/QDB2Result ../../include/QtSql/QDB2Driver ../../include/QtSql/QMYSQLResult ../../include/QtSql/QMYSQLDriver 
 SYNCQT.PRIVATE_HEADER_FILES = ../sql/kernel/qsqlcachedresult_p.h ../sql/kernel/qsqlnulldriver_p.h ../sql/models/qsqlquerymodel_p.h ../sql/models/qsqltablemodel_p.h 
Index: trunk/include/QtTest/QtTest
===================================================================
--- trunk/include/QtTest/QtTest	(revision 769)
+++ trunk/include/QtTest/QtTest	(revision 846)
@@ -3,4 +3,5 @@
 #include <QtCore/QtCore>
 #include "qbenchmark.h"
+#include "qbenchmarkmetric.h"
 #include "qsignalspy.h"
 #include "qtest.h"
Index: trunk/include/QtTest/headers.pri
===================================================================
--- trunk/include/QtTest/headers.pri	(revision 769)
+++ trunk/include/QtTest/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = qbenchmark.h qsignalspy.h qtest.h qtest_global.h qtest_gui.h qtestaccessible.h qtestassert.h qtestbasicstreamer.h qtestcase.h qtestcoreelement.h qtestcorelist.h qtestdata.h qtestelement.h qtestelementattribute.h qtestevent.h qtesteventloop.h qtestfilelogger.h qtestkeyboard.h qtestlightxmlstreamer.h qtestmouse.h qtestspontaneevent.h qtestsystem.h qtesttouch.h qtestxmlstreamer.h qtestxunitstreamer.h ../../include/QtTest/QtTest 
+SYNCQT.HEADER_FILES = qbenchmark.h qbenchmarkmetric.h qsignalspy.h qtest.h qtest_global.h qtest_gui.h qtestaccessible.h qtestassert.h qtestbasicstreamer.h qtestcase.h qtestcoreelement.h qtestcorelist.h qtestdata.h qtestelement.h qtestelementattribute.h qtestevent.h qtesteventloop.h qtestfilelogger.h qtestkeyboard.h qtestlightxmlstreamer.h qtestmouse.h qtestspontaneevent.h qtestsystem.h qtesttouch.h qtestxmlstreamer.h qtestxunitstreamer.h ../../include/QtTest/QtTest 
 SYNCQT.HEADER_CLASSES = ../../include/QtTest/QSignalSpy ../../include/QtTest/QTest ../../include/QtTest/QtTestGui ../../include/QtTest/QTestAccessibilityEvent ../../include/QtTest/QTestAccessibility ../../include/QtTest/QTestBasicStreamer ../../include/QtTest/QTestCoreElement ../../include/QtTest/QTestCoreList ../../include/QtTest/QTestData ../../include/QtTest/QTestElement ../../include/QtTest/QTestElementAttribute ../../include/QtTest/QTestEvent ../../include/QtTest/QTestKeyEvent ../../include/QtTest/QTestKeyClicksEvent ../../include/QtTest/QTestMouseEvent ../../include/QtTest/QTestDelayEvent ../../include/QtTest/QTestEventList ../../include/QtTest/QTestEventLoop ../../include/QtTest/QTestFileLogger ../../include/QtTest/QTestLightXmlStreamer ../../include/QtTest/QEventSizeOfChecker ../../include/QtTest/QSpontaneKeyEvent ../../include/QtTest/QTestXmlStreamer ../../include/QtTest/QTestXunitStreamer 
-SYNCQT.PRIVATE_HEADER_FILES = qabstracttestlogger_p.h qbenchmark_p.h qbenchmarkevent_p.h qbenchmarkmeasurement_p.h qbenchmarkvalgrind_p.h qplaintestlogger_p.h qsignaldumper_p.h qtestlog_p.h qtestlogger_p.h qtestresult_p.h qtesttable_p.h qxmltestlogger_p.h ../testlib/3rdparty/callgrind_p.h ../testlib/3rdparty/cycle_p.h ../testlib/3rdparty/valgrind_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = qabstracttestlogger_p.h qbenchmark_p.h qbenchmarkevent_p.h qbenchmarkmeasurement_p.h qbenchmarkmetric_p.h qbenchmarkvalgrind_p.h qplaintestlogger_p.h qsignaldumper_p.h qtestlog_p.h qtestlogger_p.h qtestresult_p.h qtesttable_p.h qxmltestlogger_p.h ../testlib/3rdparty/callgrind_p.h ../testlib/3rdparty/cycle_p.h ../testlib/3rdparty/valgrind_p.h 
Index: trunk/include/QtTest/private/qbenchmarkmetric_p.h
===================================================================
--- trunk/include/QtTest/private/qbenchmarkmetric_p.h	(revision 846)
+++ trunk/include/QtTest/private/qbenchmarkmetric_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/testlib/qbenchmarkmetric_p.h"
Index: trunk/include/QtTest/qbenchmarkmetric.h
===================================================================
--- trunk/include/QtTest/qbenchmarkmetric.h	(revision 846)
+++ trunk/include/QtTest/qbenchmarkmetric.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/testlib/qbenchmarkmetric.h"
Index: trunk/include/QtXml/QtXml
===================================================================
--- trunk/include/QtXml/QtXml	(revision 769)
+++ trunk/include/QtXml/QtXml	(revision 846)
@@ -2,6 +2,6 @@
 #define QT_QTXML_MODULE_H
 #include <QtCore/QtCore>
+#include "qxmlstream.h"
 #include "qxml.h"
 #include "qdom.h"
-#include "qxmlstream.h"
 #endif
Index: trunk/include/QtXml/headers.pri
===================================================================
--- trunk/include/QtXml/headers.pri	(revision 769)
+++ trunk/include/QtXml/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../xml/sax/qxml.h ../xml/dom/qdom.h ../xml/stream/qxmlstream.h ../../include/QtXml/QtXml 
-SYNCQT.HEADER_CLASSES = ../../include/QtXml/QXmlNamespaceSupport ../../include/QtXml/QXmlAttributes ../../include/QtXml/QXmlInputSource ../../include/QtXml/QXmlParseException ../../include/QtXml/QXmlReader ../../include/QtXml/QXmlSimpleReader ../../include/QtXml/QXmlLocator ../../include/QtXml/QXmlContentHandler ../../include/QtXml/QXmlErrorHandler ../../include/QtXml/QXmlDTDHandler ../../include/QtXml/QXmlEntityResolver ../../include/QtXml/QXmlLexicalHandler ../../include/QtXml/QXmlDeclHandler ../../include/QtXml/QXmlDefaultHandler ../../include/QtXml/QDomImplementation ../../include/QtXml/QDomNode ../../include/QtXml/QDomNodeList ../../include/QtXml/QDomDocumentType ../../include/QtXml/QDomDocument ../../include/QtXml/QDomNamedNodeMap ../../include/QtXml/QDomDocumentFragment ../../include/QtXml/QDomCharacterData ../../include/QtXml/QDomAttr ../../include/QtXml/QDomElement ../../include/QtXml/QDomText ../../include/QtXml/QDomComment ../../include/QtXml/QDomCDATASection ../../include/QtXml/QDomNotation ../../include/QtXml/QDomEntity ../../include/QtXml/QDomEntityReference ../../include/QtXml/QDomProcessingInstruction ../../include/QtXml/QXmlStreamAttribute ../../include/QtXml/QXmlStreamAttributes ../../include/QtXml/QXmlStreamEntityDeclaration ../../include/QtXml/QXmlStreamEntityDeclarations ../../include/QtXml/QXmlStreamEntityResolver ../../include/QtXml/QXmlStreamNamespaceDeclaration ../../include/QtXml/QXmlStreamNamespaceDeclarations ../../include/QtXml/QXmlStreamNotationDeclaration ../../include/QtXml/QXmlStreamNotationDeclarations ../../include/QtXml/QXmlStreamReader ../../include/QtXml/QXmlStreamStringRef ../../include/QtXml/QXmlStreamWriter 
+SYNCQT.HEADER_FILES = ../xml/stream/qxmlstream.h ../xml/sax/qxml.h ../xml/dom/qdom.h ../../include/QtXml/QtXml 
+SYNCQT.HEADER_CLASSES = ../../include/QtXml/QXmlStreamAttribute ../../include/QtXml/QXmlStreamAttributes ../../include/QtXml/QXmlStreamEntityDeclaration ../../include/QtXml/QXmlStreamEntityDeclarations ../../include/QtXml/QXmlStreamEntityResolver ../../include/QtXml/QXmlStreamNamespaceDeclaration ../../include/QtXml/QXmlStreamNamespaceDeclarations ../../include/QtXml/QXmlStreamNotationDeclaration ../../include/QtXml/QXmlStreamNotationDeclarations ../../include/QtXml/QXmlStreamReader ../../include/QtXml/QXmlStreamStringRef ../../include/QtXml/QXmlStreamWriter ../../include/QtXml/QXmlNamespaceSupport ../../include/QtXml/QXmlAttributes ../../include/QtXml/QXmlInputSource ../../include/QtXml/QXmlParseException ../../include/QtXml/QXmlReader ../../include/QtXml/QXmlSimpleReader ../../include/QtXml/QXmlLocator ../../include/QtXml/QXmlContentHandler ../../include/QtXml/QXmlErrorHandler ../../include/QtXml/QXmlDTDHandler ../../include/QtXml/QXmlEntityResolver ../../include/QtXml/QXmlLexicalHandler ../../include/QtXml/QXmlDeclHandler ../../include/QtXml/QXmlDefaultHandler ../../include/QtXml/QDomImplementation ../../include/QtXml/QDomNode ../../include/QtXml/QDomNodeList ../../include/QtXml/QDomDocumentType ../../include/QtXml/QDomDocument ../../include/QtXml/QDomNamedNodeMap ../../include/QtXml/QDomDocumentFragment ../../include/QtXml/QDomCharacterData ../../include/QtXml/QDomAttr ../../include/QtXml/QDomElement ../../include/QtXml/QDomText ../../include/QtXml/QDomComment ../../include/QtXml/QDomCDATASection ../../include/QtXml/QDomNotation ../../include/QtXml/QDomEntity ../../include/QtXml/QDomEntityReference ../../include/QtXml/QDomProcessingInstruction 
 SYNCQT.PRIVATE_HEADER_FILES = 
Index: trunk/include/QtXmlPatterns/headers.pri
===================================================================
--- trunk/include/QtXmlPatterns/headers.pri	(revision 769)
+++ trunk/include/QtXmlPatterns/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
 SYNCQT.HEADER_FILES = ../xmlpatterns/api/qabstractmessagehandler.h ../xmlpatterns/api/qabstracturiresolver.h ../xmlpatterns/api/qabstractxmlnodemodel.h ../xmlpatterns/api/qabstractxmlreceiver.h ../xmlpatterns/api/qsimplexmlnodemodel.h ../xmlpatterns/api/qsourcelocation.h ../xmlpatterns/api/qxmlformatter.h ../xmlpatterns/api/qxmlname.h ../xmlpatterns/api/qxmlnamepool.h ../xmlpatterns/api/qxmlquery.h ../xmlpatterns/api/qxmlresultitems.h ../xmlpatterns/api/qxmlschema.h ../xmlpatterns/api/qxmlschemavalidator.h ../xmlpatterns/api/qxmlserializer.h ../../include/QtXmlPatterns/QtXmlPatterns 
 SYNCQT.HEADER_CLASSES = ../../include/QtXmlPatterns/QAbstractMessageHandler ../../include/QtXmlPatterns/QAbstractUriResolver ../../include/QtXmlPatterns/QXmlNodeModelIndex ../../include/QtXmlPatterns/QAbstractXmlNodeModel ../../include/QtXmlPatterns/QXmlItem ../../include/QtXmlPatterns/QAbstractXmlReceiver ../../include/QtXmlPatterns/QSimpleXmlNodeModel ../../include/QtXmlPatterns/QSourceLocation ../../include/QtXmlPatterns/QXmlFormatter ../../include/QtXmlPatterns/QXmlName ../../include/QtXmlPatterns/QXmlNamePool ../../include/QtXmlPatterns/QXmlQuery ../../include/QtXmlPatterns/QXmlResultItems ../../include/QtXmlPatterns/QXmlSchema ../../include/QtXmlPatterns/QXmlSchemaValidator ../../include/QtXmlPatterns/QXmlSerializer 
-SYNCQT.PRIVATE_HEADER_FILES = ../xmlpatterns/api/qabstractxmlforwarditerator_p.h ../xmlpatterns/api/qabstractxmlnodemodel_p.h ../xmlpatterns/api/qabstractxmlpullprovider_p.h ../xmlpatterns/api/qabstractxmlreceiver_p.h ../xmlpatterns/api/qcoloringmessagehandler_p.h ../xmlpatterns/api/qcoloroutput_p.h ../xmlpatterns/api/qdeviceresourceloader_p.h ../xmlpatterns/api/qiodevicedelegate_p.h ../xmlpatterns/api/qnetworkaccessdelegator_p.h ../xmlpatterns/api/qpullbridge_p.h ../xmlpatterns/api/qreferencecountedvalue_p.h ../xmlpatterns/api/qresourcedelegator_p.h ../xmlpatterns/api/quriloader_p.h ../xmlpatterns/api/qvariableloader_p.h ../xmlpatterns/api/qxmlpatternistcli_p.h ../xmlpatterns/api/qxmlquery_p.h ../xmlpatterns/api/qxmlresultitems_p.h ../xmlpatterns/api/qxmlschema_p.h ../xmlpatterns/api/qxmlschemavalidator_p.h ../xmlpatterns/api/qxmlserializer_p.h ../xmlpatterns/schema/qnamespacesupport_p.h ../xmlpatterns/schema/qxsdalternative_p.h ../xmlpatterns/schema/qxsdannotated_p.h ../xmlpatterns/schema/qxsdannotation_p.h ../xmlpatterns/schema/qxsdapplicationinformation_p.h ../xmlpatterns/schema/qxsdassertion_p.h ../xmlpatterns/schema/qxsdattribute_p.h ../xmlpatterns/schema/qxsdattributegroup_p.h ../xmlpatterns/schema/qxsdattributereference_p.h ../xmlpatterns/schema/qxsdattributeterm_p.h ../xmlpatterns/schema/qxsdattributeuse_p.h ../xmlpatterns/schema/qxsdcomplextype_p.h ../xmlpatterns/schema/qxsddocumentation_p.h ../xmlpatterns/schema/qxsdelement_p.h ../xmlpatterns/schema/qxsdfacet_p.h ../xmlpatterns/schema/qxsdidcache_p.h ../xmlpatterns/schema/qxsdidchelper_p.h ../xmlpatterns/schema/qxsdidentityconstraint_p.h ../xmlpatterns/schema/qxsdinstancereader_p.h ../xmlpatterns/schema/qxsdmodelgroup_p.h ../xmlpatterns/schema/qxsdnotation_p.h ../xmlpatterns/schema/qxsdparticle_p.h ../xmlpatterns/schema/qxsdparticlechecker_p.h ../xmlpatterns/schema/qxsdreference_p.h ../xmlpatterns/schema/qxsdschema_p.h ../xmlpatterns/schema/qxsdschemachecker_p.h ../xmlpatterns/schema/qxsdschemacontext_p.h ../xmlpatterns/schema/qxsdschemadebugger_p.h ../xmlpatterns/schema/qxsdschemahelper_p.h ../xmlpatterns/schema/qxsdschemamerger_p.h ../xmlpatterns/schema/qxsdschemaparser_p.h ../xmlpatterns/schema/qxsdschemaparsercontext_p.h ../xmlpatterns/schema/qxsdschemaresolver_p.h ../xmlpatterns/schema/qxsdschematoken_p.h ../xmlpatterns/schema/qxsdschematypesfactory_p.h ../xmlpatterns/schema/qxsdsimpletype_p.h ../xmlpatterns/schema/qxsdstatemachine_p.h ../xmlpatterns/schema/qxsdstatemachinebuilder_p.h ../xmlpatterns/schema/qxsdterm_p.h ../xmlpatterns/schema/qxsdtypechecker_p.h ../xmlpatterns/schema/qxsduserschematype_p.h ../xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h ../xmlpatterns/schema/qxsdvalidatinginstancereader_p.h ../xmlpatterns/schema/qxsdwildcard_p.h ../xmlpatterns/schema/qxsdxpathexpression_p.h ../xmlpatterns/iterators/qcachingiterator_p.h ../xmlpatterns/iterators/qdeduplicateiterator_p.h ../xmlpatterns/iterators/qdistinctiterator_p.h ../xmlpatterns/iterators/qemptyiterator_p.h ../xmlpatterns/iterators/qexceptiterator_p.h ../xmlpatterns/iterators/qindexofiterator_p.h ../xmlpatterns/iterators/qinsertioniterator_p.h ../xmlpatterns/iterators/qintersectiterator_p.h ../xmlpatterns/iterators/qitemmappingiterator_p.h ../xmlpatterns/iterators/qrangeiterator_p.h ../xmlpatterns/iterators/qremovaliterator_p.h ../xmlpatterns/iterators/qsequencemappingiterator_p.h ../xmlpatterns/iterators/qsingletoniterator_p.h ../xmlpatterns/iterators/qsubsequenceiterator_p.h ../xmlpatterns/iterators/qtocodepointsiterator_p.h ../xmlpatterns/iterators/qunioniterator_p.h ../xmlpatterns/type/qabstractnodetest_p.h ../xmlpatterns/type/qanyitemtype_p.h ../xmlpatterns/type/qanynodetype_p.h ../xmlpatterns/type/qanysimpletype_p.h ../xmlpatterns/type/qanytype_p.h ../xmlpatterns/type/qatomiccasterlocator_p.h ../xmlpatterns/type/qatomiccasterlocators_p.h ../xmlpatterns/type/qatomiccomparatorlocator_p.h ../xmlpatterns/type/qatomiccomparatorlocators_p.h ../xmlpatterns/type/qatomicmathematicianlocator_p.h ../xmlpatterns/type/qatomicmathematicianlocators_p.h ../xmlpatterns/type/qatomictype_p.h ../xmlpatterns/type/qatomictypedispatch_p.h ../xmlpatterns/type/qbasictypesfactory_p.h ../xmlpatterns/type/qbuiltinatomictype_p.h ../xmlpatterns/type/qbuiltinatomictypes_p.h ../xmlpatterns/type/qbuiltinnodetype_p.h ../xmlpatterns/type/qbuiltintypes_p.h ../xmlpatterns/type/qcardinality_p.h ../xmlpatterns/type/qcommonsequencetypes_p.h ../xmlpatterns/type/qebvtype_p.h ../xmlpatterns/type/qemptysequencetype_p.h ../xmlpatterns/type/qgenericsequencetype_p.h ../xmlpatterns/type/qitemtype_p.h ../xmlpatterns/type/qlocalnametest_p.h ../xmlpatterns/type/qmultiitemtype_p.h ../xmlpatterns/type/qnamedschemacomponent_p.h ../xmlpatterns/type/qnamespacenametest_p.h ../xmlpatterns/type/qnonetype_p.h ../xmlpatterns/type/qnumerictype_p.h ../xmlpatterns/type/qprimitives_p.h ../xmlpatterns/type/qqnametest_p.h ../xmlpatterns/type/qschemacomponent_p.h ../xmlpatterns/type/qschematype_p.h ../xmlpatterns/type/qschematypefactory_p.h ../xmlpatterns/type/qsequencetype_p.h ../xmlpatterns/type/qtypechecker_p.h ../xmlpatterns/type/quntyped_p.h ../xmlpatterns/type/qxsltnodetest_p.h ../xmlpatterns/functions/qabstractfunctionfactory_p.h ../xmlpatterns/functions/qaccessorfns_p.h ../xmlpatterns/functions/qaggregatefns_p.h ../xmlpatterns/functions/qaggregator_p.h ../xmlpatterns/functions/qassemblestringfns_p.h ../xmlpatterns/functions/qbooleanfns_p.h ../xmlpatterns/functions/qcomparescaseaware_p.h ../xmlpatterns/functions/qcomparestringfns_p.h ../xmlpatterns/functions/qcomparingaggregator_p.h ../xmlpatterns/functions/qconstructorfunctionsfactory_p.h ../xmlpatterns/functions/qcontextfns_p.h ../xmlpatterns/functions/qcontextnodechecker_p.h ../xmlpatterns/functions/qcurrentfn_p.h ../xmlpatterns/functions/qdatetimefn_p.h ../xmlpatterns/functions/qdatetimefns_p.h ../xmlpatterns/functions/qdeepequalfn_p.h ../xmlpatterns/functions/qdocumentfn_p.h ../xmlpatterns/functions/qelementavailablefn_p.h ../xmlpatterns/functions/qerrorfn_p.h ../xmlpatterns/functions/qfunctionargument_p.h ../xmlpatterns/functions/qfunctionavailablefn_p.h ../xmlpatterns/functions/qfunctioncall_p.h ../xmlpatterns/functions/qfunctionfactory_p.h ../xmlpatterns/functions/qfunctionfactorycollection_p.h ../xmlpatterns/functions/qfunctionsignature_p.h ../xmlpatterns/functions/qgenerateidfn_p.h ../xmlpatterns/functions/qnodefns_p.h ../xmlpatterns/functions/qnumericfns_p.h ../xmlpatterns/functions/qpatternmatchingfns_p.h ../xmlpatterns/functions/qpatternplatform_p.h ../xmlpatterns/functions/qqnamefns_p.h ../xmlpatterns/functions/qresolveurifn_p.h ../xmlpatterns/functions/qsequencefns_p.h ../xmlpatterns/functions/qsequencegeneratingfns_p.h ../xmlpatterns/functions/qstaticbaseuricontainer_p.h ../xmlpatterns/functions/qstaticnamespacescontainer_p.h ../xmlpatterns/functions/qstringvaluefns_p.h ../xmlpatterns/functions/qsubstringfns_p.h ../xmlpatterns/functions/qsystempropertyfn_p.h ../xmlpatterns/functions/qtimezonefns_p.h ../xmlpatterns/functions/qtracefn_p.h ../xmlpatterns/functions/qtypeavailablefn_p.h ../xmlpatterns/functions/qunparsedentitypublicidfn_p.h ../xmlpatterns/functions/qunparsedentityurifn_p.h ../xmlpatterns/functions/qunparsedtextavailablefn_p.h ../xmlpatterns/functions/qunparsedtextfn_p.h ../xmlpatterns/functions/qxpath10corefunctions_p.h ../xmlpatterns/functions/qxpath20corefunctions_p.h ../xmlpatterns/functions/qxslt20corefunctions_p.h ../xmlpatterns/environment/qcurrentitemcontext_p.h ../xmlpatterns/environment/qdelegatingdynamiccontext_p.h ../xmlpatterns/environment/qdelegatingstaticcontext_p.h ../xmlpatterns/environment/qdynamiccontext_p.h ../xmlpatterns/environment/qfocus_p.h ../xmlpatterns/environment/qgenericdynamiccontext_p.h ../xmlpatterns/environment/qgenericstaticcontext_p.h ../xmlpatterns/environment/qreceiverdynamiccontext_p.h ../xmlpatterns/environment/qreportcontext_p.h ../xmlpatterns/environment/qstackcontextbase_p.h ../xmlpatterns/environment/qstaticbaseuricontext_p.h ../xmlpatterns/environment/qstaticcompatibilitycontext_p.h ../xmlpatterns/environment/qstaticcontext_p.h ../xmlpatterns/environment/qstaticcurrentcontext_p.h ../xmlpatterns/environment/qstaticfocuscontext_p.h ../xmlpatterns/environment/qstaticnamespacecontext_p.h ../xmlpatterns/acceltree/qacceliterators_p.h ../xmlpatterns/acceltree/qacceltree_p.h ../xmlpatterns/acceltree/qacceltreebuilder_p.h ../xmlpatterns/acceltree/qacceltreeresourceloader_p.h ../xmlpatterns/acceltree/qcompressedwhitespace_p.h ../xmlpatterns/data/qabstractdatetime_p.h ../xmlpatterns/data/qabstractduration_p.h ../xmlpatterns/data/qabstractfloat_p.h ../xmlpatterns/data/qabstractfloatcasters_p.h ../xmlpatterns/data/qabstractfloatmathematician_p.h ../xmlpatterns/data/qanyuri_p.h ../xmlpatterns/data/qatomiccaster_p.h ../xmlpatterns/data/qatomiccasters_p.h ../xmlpatterns/data/qatomiccomparator_p.h ../xmlpatterns/data/qatomiccomparators_p.h ../xmlpatterns/data/qatomicmathematician_p.h ../xmlpatterns/data/qatomicmathematicians_p.h ../xmlpatterns/data/qatomicstring_p.h ../xmlpatterns/data/qbase64binary_p.h ../xmlpatterns/data/qboolean_p.h ../xmlpatterns/data/qcommonvalues_p.h ../xmlpatterns/data/qcomparisonfactory_p.h ../xmlpatterns/data/qdate_p.h ../xmlpatterns/data/qdaytimeduration_p.h ../xmlpatterns/data/qdecimal_p.h ../xmlpatterns/data/qderivedinteger_p.h ../xmlpatterns/data/qderivedstring_p.h ../xmlpatterns/data/qduration_p.h ../xmlpatterns/data/qgday_p.h ../xmlpatterns/data/qgmonth_p.h ../xmlpatterns/data/qgmonthday_p.h ../xmlpatterns/data/qgyear_p.h ../xmlpatterns/data/qgyearmonth_p.h ../xmlpatterns/data/qhexbinary_p.h ../xmlpatterns/data/qinteger_p.h ../xmlpatterns/data/qitem_p.h ../xmlpatterns/data/qnodebuilder_p.h ../xmlpatterns/data/qqnamevalue_p.h ../xmlpatterns/data/qresourceloader_p.h ../xmlpatterns/data/qschemadatetime_p.h ../xmlpatterns/data/qschemanumeric_p.h ../xmlpatterns/data/qschematime_p.h ../xmlpatterns/data/qsequencereceiver_p.h ../xmlpatterns/data/qsorttuple_p.h ../xmlpatterns/data/quntypedatomic_p.h ../xmlpatterns/data/qvalidationerror_p.h ../xmlpatterns/data/qvaluefactory_p.h ../xmlpatterns/data/qyearmonthduration_p.h ../xmlpatterns/parser/qmaintainingreader_p.h ../xmlpatterns/parser/qparsercontext_p.h ../xmlpatterns/parser/qquerytransformparser_p.h ../xmlpatterns/parser/qtokenizer_p.h ../xmlpatterns/parser/qtokenrevealer_p.h ../xmlpatterns/parser/qtokensource_p.h ../xmlpatterns/parser/qxquerytokenizer_p.h ../xmlpatterns/parser/qxslttokenizer_p.h ../xmlpatterns/parser/qxslttokenlookup_p.h ../xmlpatterns/janitors/qargumentconverter_p.h ../xmlpatterns/janitors/qatomizer_p.h ../xmlpatterns/janitors/qcardinalityverifier_p.h ../xmlpatterns/janitors/qebvextractor_p.h ../xmlpatterns/janitors/qitemverifier_p.h ../xmlpatterns/janitors/quntypedatomicconverter_p.h ../xmlpatterns/expr/qandexpression_p.h ../xmlpatterns/expr/qapplytemplate_p.h ../xmlpatterns/expr/qargumentreference_p.h ../xmlpatterns/expr/qarithmeticexpression_p.h ../xmlpatterns/expr/qattributeconstructor_p.h ../xmlpatterns/expr/qattributenamevalidator_p.h ../xmlpatterns/expr/qaxisstep_p.h ../xmlpatterns/expr/qcachecells_p.h ../xmlpatterns/expr/qcallsite_p.h ../xmlpatterns/expr/qcalltargetdescription_p.h ../xmlpatterns/expr/qcalltemplate_p.h ../xmlpatterns/expr/qcastableas_p.h ../xmlpatterns/expr/qcastas_p.h ../xmlpatterns/expr/qcastingplatform_p.h ../xmlpatterns/expr/qcollationchecker_p.h ../xmlpatterns/expr/qcombinenodes_p.h ../xmlpatterns/expr/qcommentconstructor_p.h ../xmlpatterns/expr/qcomparisonplatform_p.h ../xmlpatterns/expr/qcomputednamespaceconstructor_p.h ../xmlpatterns/expr/qcontextitem_p.h ../xmlpatterns/expr/qcopyof_p.h ../xmlpatterns/expr/qcurrentitemstore_p.h ../xmlpatterns/expr/qdocumentconstructor_p.h ../xmlpatterns/expr/qdocumentcontentvalidator_p.h ../xmlpatterns/expr/qdynamiccontextstore_p.h ../xmlpatterns/expr/qelementconstructor_p.h ../xmlpatterns/expr/qemptycontainer_p.h ../xmlpatterns/expr/qemptysequence_p.h ../xmlpatterns/expr/qevaluationcache_p.h ../xmlpatterns/expr/qexpression_p.h ../xmlpatterns/expr/qexpressiondispatch_p.h ../xmlpatterns/expr/qexpressionfactory_p.h ../xmlpatterns/expr/qexpressionsequence_p.h ../xmlpatterns/expr/qexpressionvariablereference_p.h ../xmlpatterns/expr/qexternalvariableloader_p.h ../xmlpatterns/expr/qexternalvariablereference_p.h ../xmlpatterns/expr/qfirstitempredicate_p.h ../xmlpatterns/expr/qforclause_p.h ../xmlpatterns/expr/qgeneralcomparison_p.h ../xmlpatterns/expr/qgenericpredicate_p.h ../xmlpatterns/expr/qifthenclause_p.h ../xmlpatterns/expr/qinstanceof_p.h ../xmlpatterns/expr/qletclause_p.h ../xmlpatterns/expr/qliteral_p.h ../xmlpatterns/expr/qliteralsequence_p.h ../xmlpatterns/expr/qnamespaceconstructor_p.h ../xmlpatterns/expr/qncnameconstructor_p.h ../xmlpatterns/expr/qnodecomparison_p.h ../xmlpatterns/expr/qnodesort_p.h ../xmlpatterns/expr/qoperandsiterator_p.h ../xmlpatterns/expr/qoptimizationpasses_p.h ../xmlpatterns/expr/qoptimizerblocks_p.h ../xmlpatterns/expr/qoptimizerframework_p.h ../xmlpatterns/expr/qorderby_p.h ../xmlpatterns/expr/qorexpression_p.h ../xmlpatterns/expr/qpaircontainer_p.h ../xmlpatterns/expr/qparentnodeaxis_p.h ../xmlpatterns/expr/qpath_p.h ../xmlpatterns/expr/qpositionalvariablereference_p.h ../xmlpatterns/expr/qprocessinginstructionconstructor_p.h ../xmlpatterns/expr/qqnameconstructor_p.h ../xmlpatterns/expr/qquantifiedexpression_p.h ../xmlpatterns/expr/qrangeexpression_p.h ../xmlpatterns/expr/qrangevariablereference_p.h ../xmlpatterns/expr/qreturnorderby_p.h ../xmlpatterns/expr/qsimplecontentconstructor_p.h ../xmlpatterns/expr/qsinglecontainer_p.h ../xmlpatterns/expr/qsourcelocationreflection_p.h ../xmlpatterns/expr/qstaticbaseuristore_p.h ../xmlpatterns/expr/qstaticcompatibilitystore_p.h ../xmlpatterns/expr/qtemplate_p.h ../xmlpatterns/expr/qtemplateinvoker_p.h ../xmlpatterns/expr/qtemplatemode_p.h ../xmlpatterns/expr/qtemplateparameterreference_p.h ../xmlpatterns/expr/qtemplatepattern_p.h ../xmlpatterns/expr/qtextnodeconstructor_p.h ../xmlpatterns/expr/qtreatas_p.h ../xmlpatterns/expr/qtriplecontainer_p.h ../xmlpatterns/expr/qtruthpredicate_p.h ../xmlpatterns/expr/qunaryexpression_p.h ../xmlpatterns/expr/qunlimitedcontainer_p.h ../xmlpatterns/expr/qunresolvedvariablereference_p.h ../xmlpatterns/expr/quserfunction_p.h ../xmlpatterns/expr/quserfunctioncallsite_p.h ../xmlpatterns/expr/qvalidate_p.h ../xmlpatterns/expr/qvaluecomparison_p.h ../xmlpatterns/expr/qvariabledeclaration_p.h ../xmlpatterns/expr/qvariablereference_p.h ../xmlpatterns/expr/qwithparam_p.h ../xmlpatterns/expr/qxsltsimplecontentconstructor_p.h ../xmlpatterns/projection/qdocumentprojector_p.h ../xmlpatterns/projection/qprojectedexpression_p.h ../xmlpatterns/utils/qautoptr_p.h ../xmlpatterns/utils/qcommonnamespaces_p.h ../xmlpatterns/utils/qcppcastinghelper_p.h ../xmlpatterns/utils/qdebug_p.h ../xmlpatterns/utils/qdelegatingnamespaceresolver_p.h ../xmlpatterns/utils/qgenericnamespaceresolver_p.h ../xmlpatterns/utils/qnamepool_p.h ../xmlpatterns/utils/qnamespacebinding_p.h ../xmlpatterns/utils/qnamespaceresolver_p.h ../xmlpatterns/utils/qnodenamespaceresolver_p.h ../xmlpatterns/utils/qoutputvalidator_p.h ../xmlpatterns/utils/qpatternistlocale_p.h ../xmlpatterns/utils/qxpathhelper_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = ../xmlpatterns/janitors/qargumentconverter_p.h ../xmlpatterns/janitors/qatomizer_p.h ../xmlpatterns/janitors/qcardinalityverifier_p.h ../xmlpatterns/janitors/qebvextractor_p.h ../xmlpatterns/janitors/qitemverifier_p.h ../xmlpatterns/janitors/quntypedatomicconverter_p.h ../xmlpatterns/acceltree/qacceliterators_p.h ../xmlpatterns/acceltree/qacceltree_p.h ../xmlpatterns/acceltree/qacceltreebuilder_p.h ../xmlpatterns/acceltree/qacceltreeresourceloader_p.h ../xmlpatterns/acceltree/qcompressedwhitespace_p.h ../xmlpatterns/environment/qcurrentitemcontext_p.h ../xmlpatterns/environment/qdelegatingdynamiccontext_p.h ../xmlpatterns/environment/qdelegatingstaticcontext_p.h ../xmlpatterns/environment/qdynamiccontext_p.h ../xmlpatterns/environment/qfocus_p.h ../xmlpatterns/environment/qgenericdynamiccontext_p.h ../xmlpatterns/environment/qgenericstaticcontext_p.h ../xmlpatterns/environment/qreceiverdynamiccontext_p.h ../xmlpatterns/environment/qreportcontext_p.h ../xmlpatterns/environment/qstackcontextbase_p.h ../xmlpatterns/environment/qstaticbaseuricontext_p.h ../xmlpatterns/environment/qstaticcompatibilitycontext_p.h ../xmlpatterns/environment/qstaticcontext_p.h ../xmlpatterns/environment/qstaticcurrentcontext_p.h ../xmlpatterns/environment/qstaticfocuscontext_p.h ../xmlpatterns/environment/qstaticnamespacecontext_p.h ../xmlpatterns/data/qabstractdatetime_p.h ../xmlpatterns/data/qabstractduration_p.h ../xmlpatterns/data/qabstractfloat_p.h ../xmlpatterns/data/qabstractfloatcasters_p.h ../xmlpatterns/data/qabstractfloatmathematician_p.h ../xmlpatterns/data/qanyuri_p.h ../xmlpatterns/data/qatomiccaster_p.h ../xmlpatterns/data/qatomiccasters_p.h ../xmlpatterns/data/qatomiccomparator_p.h ../xmlpatterns/data/qatomiccomparators_p.h ../xmlpatterns/data/qatomicmathematician_p.h ../xmlpatterns/data/qatomicmathematicians_p.h ../xmlpatterns/data/qatomicstring_p.h ../xmlpatterns/data/qbase64binary_p.h ../xmlpatterns/data/qboolean_p.h ../xmlpatterns/data/qcommonvalues_p.h ../xmlpatterns/data/qcomparisonfactory_p.h ../xmlpatterns/data/qdate_p.h ../xmlpatterns/data/qdaytimeduration_p.h ../xmlpatterns/data/qdecimal_p.h ../xmlpatterns/data/qderivedinteger_p.h ../xmlpatterns/data/qderivedstring_p.h ../xmlpatterns/data/qduration_p.h ../xmlpatterns/data/qgday_p.h ../xmlpatterns/data/qgmonth_p.h ../xmlpatterns/data/qgmonthday_p.h ../xmlpatterns/data/qgyear_p.h ../xmlpatterns/data/qgyearmonth_p.h ../xmlpatterns/data/qhexbinary_p.h ../xmlpatterns/data/qinteger_p.h ../xmlpatterns/data/qitem_p.h ../xmlpatterns/data/qnodebuilder_p.h ../xmlpatterns/data/qqnamevalue_p.h ../xmlpatterns/data/qresourceloader_p.h ../xmlpatterns/data/qschemadatetime_p.h ../xmlpatterns/data/qschemanumeric_p.h ../xmlpatterns/data/qschematime_p.h ../xmlpatterns/data/qsequencereceiver_p.h ../xmlpatterns/data/qsorttuple_p.h ../xmlpatterns/data/quntypedatomic_p.h ../xmlpatterns/data/qvalidationerror_p.h ../xmlpatterns/data/qvaluefactory_p.h ../xmlpatterns/data/qyearmonthduration_p.h ../xmlpatterns/type/qabstractnodetest_p.h ../xmlpatterns/type/qanyitemtype_p.h ../xmlpatterns/type/qanynodetype_p.h ../xmlpatterns/type/qanysimpletype_p.h ../xmlpatterns/type/qanytype_p.h ../xmlpatterns/type/qatomiccasterlocator_p.h ../xmlpatterns/type/qatomiccasterlocators_p.h ../xmlpatterns/type/qatomiccomparatorlocator_p.h ../xmlpatterns/type/qatomiccomparatorlocators_p.h ../xmlpatterns/type/qatomicmathematicianlocator_p.h ../xmlpatterns/type/qatomicmathematicianlocators_p.h ../xmlpatterns/type/qatomictype_p.h ../xmlpatterns/type/qatomictypedispatch_p.h ../xmlpatterns/type/qbasictypesfactory_p.h ../xmlpatterns/type/qbuiltinatomictype_p.h ../xmlpatterns/type/qbuiltinatomictypes_p.h ../xmlpatterns/type/qbuiltinnodetype_p.h ../xmlpatterns/type/qbuiltintypes_p.h ../xmlpatterns/type/qcardinality_p.h ../xmlpatterns/type/qcommonsequencetypes_p.h ../xmlpatterns/type/qebvtype_p.h ../xmlpatterns/type/qemptysequencetype_p.h ../xmlpatterns/type/qgenericsequencetype_p.h ../xmlpatterns/type/qitemtype_p.h ../xmlpatterns/type/qlocalnametest_p.h ../xmlpatterns/type/qmultiitemtype_p.h ../xmlpatterns/type/qnamedschemacomponent_p.h ../xmlpatterns/type/qnamespacenametest_p.h ../xmlpatterns/type/qnonetype_p.h ../xmlpatterns/type/qnumerictype_p.h ../xmlpatterns/type/qprimitives_p.h ../xmlpatterns/type/qqnametest_p.h ../xmlpatterns/type/qschemacomponent_p.h ../xmlpatterns/type/qschematype_p.h ../xmlpatterns/type/qschematypefactory_p.h ../xmlpatterns/type/qsequencetype_p.h ../xmlpatterns/type/qtypechecker_p.h ../xmlpatterns/type/quntyped_p.h ../xmlpatterns/type/qxsltnodetest_p.h ../xmlpatterns/api/qabstractxmlforwarditerator_p.h ../xmlpatterns/api/qabstractxmlnodemodel_p.h ../xmlpatterns/api/qabstractxmlpullprovider_p.h ../xmlpatterns/api/qabstractxmlreceiver_p.h ../xmlpatterns/api/qcoloringmessagehandler_p.h ../xmlpatterns/api/qcoloroutput_p.h ../xmlpatterns/api/qdeviceresourceloader_p.h ../xmlpatterns/api/qiodevicedelegate_p.h ../xmlpatterns/api/qnetworkaccessdelegator_p.h ../xmlpatterns/api/qpullbridge_p.h ../xmlpatterns/api/qreferencecountedvalue_p.h ../xmlpatterns/api/qresourcedelegator_p.h ../xmlpatterns/api/quriloader_p.h ../xmlpatterns/api/qvariableloader_p.h ../xmlpatterns/api/qxmlpatternistcli_p.h ../xmlpatterns/api/qxmlquery_p.h ../xmlpatterns/api/qxmlresultitems_p.h ../xmlpatterns/api/qxmlschema_p.h ../xmlpatterns/api/qxmlschemavalidator_p.h ../xmlpatterns/api/qxmlserializer_p.h ../xmlpatterns/iterators/qcachingiterator_p.h ../xmlpatterns/iterators/qdeduplicateiterator_p.h ../xmlpatterns/iterators/qdistinctiterator_p.h ../xmlpatterns/iterators/qemptyiterator_p.h ../xmlpatterns/iterators/qexceptiterator_p.h ../xmlpatterns/iterators/qindexofiterator_p.h ../xmlpatterns/iterators/qinsertioniterator_p.h ../xmlpatterns/iterators/qintersectiterator_p.h ../xmlpatterns/iterators/qitemmappingiterator_p.h ../xmlpatterns/iterators/qrangeiterator_p.h ../xmlpatterns/iterators/qremovaliterator_p.h ../xmlpatterns/iterators/qsequencemappingiterator_p.h ../xmlpatterns/iterators/qsingletoniterator_p.h ../xmlpatterns/iterators/qsubsequenceiterator_p.h ../xmlpatterns/iterators/qtocodepointsiterator_p.h ../xmlpatterns/iterators/qunioniterator_p.h ../xmlpatterns/parser/qmaintainingreader_p.h ../xmlpatterns/parser/qparsercontext_p.h ../xmlpatterns/parser/qquerytransformparser_p.h ../xmlpatterns/parser/qtokenizer_p.h ../xmlpatterns/parser/qtokenrevealer_p.h ../xmlpatterns/parser/qtokensource_p.h ../xmlpatterns/parser/qxquerytokenizer_p.h ../xmlpatterns/parser/qxslttokenizer_p.h ../xmlpatterns/parser/qxslttokenlookup_p.h ../xmlpatterns/expr/qandexpression_p.h ../xmlpatterns/expr/qapplytemplate_p.h ../xmlpatterns/expr/qargumentreference_p.h ../xmlpatterns/expr/qarithmeticexpression_p.h ../xmlpatterns/expr/qattributeconstructor_p.h ../xmlpatterns/expr/qattributenamevalidator_p.h ../xmlpatterns/expr/qaxisstep_p.h ../xmlpatterns/expr/qcachecells_p.h ../xmlpatterns/expr/qcallsite_p.h ../xmlpatterns/expr/qcalltargetdescription_p.h ../xmlpatterns/expr/qcalltemplate_p.h ../xmlpatterns/expr/qcastableas_p.h ../xmlpatterns/expr/qcastas_p.h ../xmlpatterns/expr/qcastingplatform_p.h ../xmlpatterns/expr/qcollationchecker_p.h ../xmlpatterns/expr/qcombinenodes_p.h ../xmlpatterns/expr/qcommentconstructor_p.h ../xmlpatterns/expr/qcomparisonplatform_p.h ../xmlpatterns/expr/qcomputednamespaceconstructor_p.h ../xmlpatterns/expr/qcontextitem_p.h ../xmlpatterns/expr/qcopyof_p.h ../xmlpatterns/expr/qcurrentitemstore_p.h ../xmlpatterns/expr/qdocumentconstructor_p.h ../xmlpatterns/expr/qdocumentcontentvalidator_p.h ../xmlpatterns/expr/qdynamiccontextstore_p.h ../xmlpatterns/expr/qelementconstructor_p.h ../xmlpatterns/expr/qemptycontainer_p.h ../xmlpatterns/expr/qemptysequence_p.h ../xmlpatterns/expr/qevaluationcache_p.h ../xmlpatterns/expr/qexpression_p.h ../xmlpatterns/expr/qexpressiondispatch_p.h ../xmlpatterns/expr/qexpressionfactory_p.h ../xmlpatterns/expr/qexpressionsequence_p.h ../xmlpatterns/expr/qexpressionvariablereference_p.h ../xmlpatterns/expr/qexternalvariableloader_p.h ../xmlpatterns/expr/qexternalvariablereference_p.h ../xmlpatterns/expr/qfirstitempredicate_p.h ../xmlpatterns/expr/qforclause_p.h ../xmlpatterns/expr/qgeneralcomparison_p.h ../xmlpatterns/expr/qgenericpredicate_p.h ../xmlpatterns/expr/qifthenclause_p.h ../xmlpatterns/expr/qinstanceof_p.h ../xmlpatterns/expr/qletclause_p.h ../xmlpatterns/expr/qliteral_p.h ../xmlpatterns/expr/qliteralsequence_p.h ../xmlpatterns/expr/qnamespaceconstructor_p.h ../xmlpatterns/expr/qncnameconstructor_p.h ../xmlpatterns/expr/qnodecomparison_p.h ../xmlpatterns/expr/qnodesort_p.h ../xmlpatterns/expr/qoperandsiterator_p.h ../xmlpatterns/expr/qoptimizationpasses_p.h ../xmlpatterns/expr/qoptimizerblocks_p.h ../xmlpatterns/expr/qoptimizerframework_p.h ../xmlpatterns/expr/qorderby_p.h ../xmlpatterns/expr/qorexpression_p.h ../xmlpatterns/expr/qpaircontainer_p.h ../xmlpatterns/expr/qparentnodeaxis_p.h ../xmlpatterns/expr/qpath_p.h ../xmlpatterns/expr/qpositionalvariablereference_p.h ../xmlpatterns/expr/qprocessinginstructionconstructor_p.h ../xmlpatterns/expr/qqnameconstructor_p.h ../xmlpatterns/expr/qquantifiedexpression_p.h ../xmlpatterns/expr/qrangeexpression_p.h ../xmlpatterns/expr/qrangevariablereference_p.h ../xmlpatterns/expr/qreturnorderby_p.h ../xmlpatterns/expr/qsimplecontentconstructor_p.h ../xmlpatterns/expr/qsinglecontainer_p.h ../xmlpatterns/expr/qsourcelocationreflection_p.h ../xmlpatterns/expr/qstaticbaseuristore_p.h ../xmlpatterns/expr/qstaticcompatibilitystore_p.h ../xmlpatterns/expr/qtemplate_p.h ../xmlpatterns/expr/qtemplateinvoker_p.h ../xmlpatterns/expr/qtemplatemode_p.h ../xmlpatterns/expr/qtemplateparameterreference_p.h ../xmlpatterns/expr/qtemplatepattern_p.h ../xmlpatterns/expr/qtextnodeconstructor_p.h ../xmlpatterns/expr/qtreatas_p.h ../xmlpatterns/expr/qtriplecontainer_p.h ../xmlpatterns/expr/qtruthpredicate_p.h ../xmlpatterns/expr/qunaryexpression_p.h ../xmlpatterns/expr/qunlimitedcontainer_p.h ../xmlpatterns/expr/qunresolvedvariablereference_p.h ../xmlpatterns/expr/quserfunction_p.h ../xmlpatterns/expr/quserfunctioncallsite_p.h ../xmlpatterns/expr/qvalidate_p.h ../xmlpatterns/expr/qvaluecomparison_p.h ../xmlpatterns/expr/qvariabledeclaration_p.h ../xmlpatterns/expr/qvariablereference_p.h ../xmlpatterns/expr/qwithparam_p.h ../xmlpatterns/expr/qxsltsimplecontentconstructor_p.h ../xmlpatterns/utils/qautoptr_p.h ../xmlpatterns/utils/qcommonnamespaces_p.h ../xmlpatterns/utils/qcppcastinghelper_p.h ../xmlpatterns/utils/qdebug_p.h ../xmlpatterns/utils/qdelegatingnamespaceresolver_p.h ../xmlpatterns/utils/qgenericnamespaceresolver_p.h ../xmlpatterns/utils/qnamepool_p.h ../xmlpatterns/utils/qnamespacebinding_p.h ../xmlpatterns/utils/qnamespaceresolver_p.h ../xmlpatterns/utils/qnodenamespaceresolver_p.h ../xmlpatterns/utils/qoutputvalidator_p.h ../xmlpatterns/utils/qpatternistlocale_p.h ../xmlpatterns/utils/qxpathhelper_p.h ../xmlpatterns/schema/qnamespacesupport_p.h ../xmlpatterns/schema/qxsdalternative_p.h ../xmlpatterns/schema/qxsdannotated_p.h ../xmlpatterns/schema/qxsdannotation_p.h ../xmlpatterns/schema/qxsdapplicationinformation_p.h ../xmlpatterns/schema/qxsdassertion_p.h ../xmlpatterns/schema/qxsdattribute_p.h ../xmlpatterns/schema/qxsdattributegroup_p.h ../xmlpatterns/schema/qxsdattributereference_p.h ../xmlpatterns/schema/qxsdattributeterm_p.h ../xmlpatterns/schema/qxsdattributeuse_p.h ../xmlpatterns/schema/qxsdcomplextype_p.h ../xmlpatterns/schema/qxsddocumentation_p.h ../xmlpatterns/schema/qxsdelement_p.h ../xmlpatterns/schema/qxsdfacet_p.h ../xmlpatterns/schema/qxsdidcache_p.h ../xmlpatterns/schema/qxsdidchelper_p.h ../xmlpatterns/schema/qxsdidentityconstraint_p.h ../xmlpatterns/schema/qxsdinstancereader_p.h ../xmlpatterns/schema/qxsdmodelgroup_p.h ../xmlpatterns/schema/qxsdnotation_p.h ../xmlpatterns/schema/qxsdparticle_p.h ../xmlpatterns/schema/qxsdparticlechecker_p.h ../xmlpatterns/schema/qxsdreference_p.h ../xmlpatterns/schema/qxsdschema_p.h ../xmlpatterns/schema/qxsdschemachecker_p.h ../xmlpatterns/schema/qxsdschemacontext_p.h ../xmlpatterns/schema/qxsdschemadebugger_p.h ../xmlpatterns/schema/qxsdschemahelper_p.h ../xmlpatterns/schema/qxsdschemamerger_p.h ../xmlpatterns/schema/qxsdschemaparser_p.h ../xmlpatterns/schema/qxsdschemaparsercontext_p.h ../xmlpatterns/schema/qxsdschemaresolver_p.h ../xmlpatterns/schema/qxsdschematoken_p.h ../xmlpatterns/schema/qxsdschematypesfactory_p.h ../xmlpatterns/schema/qxsdsimpletype_p.h ../xmlpatterns/schema/qxsdstatemachine_p.h ../xmlpatterns/schema/qxsdstatemachinebuilder_p.h ../xmlpatterns/schema/qxsdterm_p.h ../xmlpatterns/schema/qxsdtypechecker_p.h ../xmlpatterns/schema/qxsduserschematype_p.h ../xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h ../xmlpatterns/schema/qxsdvalidatinginstancereader_p.h ../xmlpatterns/schema/qxsdwildcard_p.h ../xmlpatterns/schema/qxsdxpathexpression_p.h ../xmlpatterns/projection/qdocumentprojector_p.h ../xmlpatterns/projection/qprojectedexpression_p.h ../xmlpatterns/functions/qabstractfunctionfactory_p.h ../xmlpatterns/functions/qaccessorfns_p.h ../xmlpatterns/functions/qaggregatefns_p.h ../xmlpatterns/functions/qaggregator_p.h ../xmlpatterns/functions/qassemblestringfns_p.h ../xmlpatterns/functions/qbooleanfns_p.h ../xmlpatterns/functions/qcomparescaseaware_p.h ../xmlpatterns/functions/qcomparestringfns_p.h ../xmlpatterns/functions/qcomparingaggregator_p.h ../xmlpatterns/functions/qconstructorfunctionsfactory_p.h ../xmlpatterns/functions/qcontextfns_p.h ../xmlpatterns/functions/qcontextnodechecker_p.h ../xmlpatterns/functions/qcurrentfn_p.h ../xmlpatterns/functions/qdatetimefn_p.h ../xmlpatterns/functions/qdatetimefns_p.h ../xmlpatterns/functions/qdeepequalfn_p.h ../xmlpatterns/functions/qdocumentfn_p.h ../xmlpatterns/functions/qelementavailablefn_p.h ../xmlpatterns/functions/qerrorfn_p.h ../xmlpatterns/functions/qfunctionargument_p.h ../xmlpatterns/functions/qfunctionavailablefn_p.h ../xmlpatterns/functions/qfunctioncall_p.h ../xmlpatterns/functions/qfunctionfactory_p.h ../xmlpatterns/functions/qfunctionfactorycollection_p.h ../xmlpatterns/functions/qfunctionsignature_p.h ../xmlpatterns/functions/qgenerateidfn_p.h ../xmlpatterns/functions/qnodefns_p.h ../xmlpatterns/functions/qnumericfns_p.h ../xmlpatterns/functions/qpatternmatchingfns_p.h ../xmlpatterns/functions/qpatternplatform_p.h ../xmlpatterns/functions/qqnamefns_p.h ../xmlpatterns/functions/qresolveurifn_p.h ../xmlpatterns/functions/qsequencefns_p.h ../xmlpatterns/functions/qsequencegeneratingfns_p.h ../xmlpatterns/functions/qstaticbaseuricontainer_p.h ../xmlpatterns/functions/qstaticnamespacescontainer_p.h ../xmlpatterns/functions/qstringvaluefns_p.h ../xmlpatterns/functions/qsubstringfns_p.h ../xmlpatterns/functions/qsystempropertyfn_p.h ../xmlpatterns/functions/qtimezonefns_p.h ../xmlpatterns/functions/qtracefn_p.h ../xmlpatterns/functions/qtypeavailablefn_p.h ../xmlpatterns/functions/qunparsedentitypublicidfn_p.h ../xmlpatterns/functions/qunparsedentityurifn_p.h ../xmlpatterns/functions/qunparsedtextavailablefn_p.h ../xmlpatterns/functions/qunparsedtextfn_p.h ../xmlpatterns/functions/qxpath10corefunctions_p.h ../xmlpatterns/functions/qxpath20corefunctions_p.h ../xmlpatterns/functions/qxslt20corefunctions_p.h 
Index: trunk/include/phonon/AudioDataOutput
===================================================================
--- trunk/include/phonon/AudioDataOutput	(revision 846)
+++ trunk/include/phonon/AudioDataOutput	(revision 846)
@@ -0,0 +1,1 @@
+#include "audiodataoutput.h"
Index: trunk/include/phonon/AudioDataOutputInterface
===================================================================
--- trunk/include/phonon/AudioDataOutputInterface	(revision 846)
+++ trunk/include/phonon/AudioDataOutputInterface	(revision 846)
@@ -0,0 +1,1 @@
+#include "audiodataoutputinterface.h"
Index: trunk/include/phonon/GlobalConfig
===================================================================
--- trunk/include/phonon/GlobalConfig	(revision 846)
+++ trunk/include/phonon/GlobalConfig	(revision 846)
@@ -0,0 +1,1 @@
+#include "globalconfig.h"
Index: trunk/include/phonon/PulseSupport
===================================================================
--- trunk/include/phonon/PulseSupport	(revision 846)
+++ trunk/include/phonon/PulseSupport	(revision 846)
@@ -0,0 +1,1 @@
+#include "pulsesupport.h"
Index: trunk/include/phonon/VideoWidgetInterface44
===================================================================
--- trunk/include/phonon/VideoWidgetInterface44	(revision 846)
+++ trunk/include/phonon/VideoWidgetInterface44	(revision 846)
@@ -0,0 +1,1 @@
+#include "videowidgetinterface.h"
Index: trunk/include/phonon/VideoWidgetInterfaceLatest
===================================================================
--- trunk/include/phonon/VideoWidgetInterfaceLatest	(revision 846)
+++ trunk/include/phonon/VideoWidgetInterfaceLatest	(revision 846)
@@ -0,0 +1,1 @@
+#include "videowidgetinterface.h"
Index: trunk/include/phonon/audiodataoutput.h
===================================================================
--- trunk/include/phonon/audiodataoutput.h	(revision 846)
+++ trunk/include/phonon/audiodataoutput.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/audiodataoutput.h"
Index: trunk/include/phonon/audiodataoutputinterface.h
===================================================================
--- trunk/include/phonon/audiodataoutputinterface.h	(revision 846)
+++ trunk/include/phonon/audiodataoutputinterface.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/audiodataoutputinterface.h"
Index: trunk/include/phonon/globalconfig.h
===================================================================
--- trunk/include/phonon/globalconfig.h	(revision 846)
+++ trunk/include/phonon/globalconfig.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/globalconfig.h"
Index: trunk/include/phonon/headers.pri
===================================================================
--- trunk/include/phonon/headers.pri	(revision 769)
+++ trunk/include/phonon/headers.pri	(revision 846)
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../phonon/../3rdparty/phonon/phonon/abstractaudiooutput.h ../phonon/../3rdparty/phonon/phonon/abstractmediastream.h ../phonon/../3rdparty/phonon/phonon/abstractvideooutput.h ../phonon/../3rdparty/phonon/phonon/addoninterface.h ../phonon/../3rdparty/phonon/phonon/audiooutput.h ../phonon/../3rdparty/phonon/phonon/audiooutputinterface.h ../phonon/../3rdparty/phonon/phonon/backendcapabilities.h ../phonon/../3rdparty/phonon/phonon/backendinterface.h ../phonon/../3rdparty/phonon/phonon/effect.h ../phonon/../3rdparty/phonon/phonon/effectinterface.h ../phonon/../3rdparty/phonon/phonon/effectparameter.h ../phonon/../3rdparty/phonon/phonon/effectwidget.h ../phonon/../3rdparty/phonon/phonon/mediacontroller.h ../phonon/../3rdparty/phonon/phonon/medianode.h ../phonon/../3rdparty/phonon/phonon/mediaobject.h ../phonon/../3rdparty/phonon/phonon/mediaobjectinterface.h ../phonon/../3rdparty/phonon/phonon/mediasource.h ../phonon/../3rdparty/phonon/phonon/objectdescription.h ../phonon/../3rdparty/phonon/phonon/objectdescriptionmodel.h ../phonon/../3rdparty/phonon/phonon/path.h ../phonon/../3rdparty/phonon/phonon/phonon_export.h ../phonon/../3rdparty/phonon/phonon/phonondefs.h ../phonon/../3rdparty/phonon/phonon/phononnamespace.h ../phonon/../3rdparty/phonon/phonon/platformplugin.h ../phonon/../3rdparty/phonon/phonon/seekslider.h ../phonon/../3rdparty/phonon/phonon/streaminterface.h ../phonon/../3rdparty/phonon/phonon/videoplayer.h ../phonon/../3rdparty/phonon/phonon/videowidget.h ../phonon/../3rdparty/phonon/phonon/videowidgetinterface.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect.h ../phonon/../3rdparty/phonon/phonon/volumefaderinterface.h ../phonon/../3rdparty/phonon/phonon/volumeslider.h ../../include/phonon/phonon ../../include/phonon_compat/Phonon/Phonon 
-SYNCQT.HEADER_CLASSES = ../../include/phonon/AbstractAudioOutput ../../include/phonon/AbstractMediaStream ../../include/phonon/AbstractVideoOutput ../../include/phonon/AddonInterface ../../include/phonon/AudioOutput ../../include/phonon/AudioOutputInterface40 ../../include/phonon/AudioOutputInterface42 ../../include/phonon/AudioOutputInterface ../../include/phonon/BackendCapabilities ../../include/phonon/BackendInterface ../../include/phonon/Effect ../../include/phonon/EffectInterface ../../include/phonon/EffectParameter ../../include/phonon/EffectWidget ../../include/phonon/MediaController ../../include/phonon/MediaNode ../../include/phonon/MediaObject ../../include/phonon/MediaObjectInterface ../../include/phonon/MediaSource ../../include/phonon/ObjectDescriptionData ../../include/phonon/ObjectDescription ../../include/phonon/AudioOutputDevice ../../include/phonon/AudioCaptureDevice ../../include/phonon/EffectDescription ../../include/phonon/AudioChannelDescription ../../include/phonon/SubtitleDescription ../../include/phonon/ObjectDescriptionModelData ../../include/phonon/ObjectDescriptionModel ../../include/phonon/AudioOutputDeviceModel ../../include/phonon/AudioCaptureDeviceModel ../../include/phonon/EffectDescriptionModel ../../include/phonon/AudioChannelDescriptionModel ../../include/phonon/SubtitleDescriptionModel ../../include/phonon/Path ../../include/phonon/Global ../../include/phonon/PlatformPlugin ../../include/phonon/SeekSlider ../../include/phonon/StreamInterface ../../include/phonon/VideoPlayer ../../include/phonon/VideoWidget ../../include/phonon/VideoWidgetInterface ../../include/phonon/VolumeFaderEffect ../../include/phonon/VolumeFaderInterface ../../include/phonon/VolumeSlider 
-SYNCQT.PRIVATE_HEADER_FILES = ../phonon/../3rdparty/phonon/phonon/abstractaudiooutput_p.h ../phonon/../3rdparty/phonon/phonon/abstractmediastream_p.h ../phonon/../3rdparty/phonon/phonon/abstractvideooutput_p.h ../phonon/../3rdparty/phonon/phonon/audiooutput_p.h ../phonon/../3rdparty/phonon/phonon/audiooutputadaptor_p.h ../phonon/../3rdparty/phonon/phonon/backendcapabilities_p.h ../phonon/../3rdparty/phonon/phonon/effect_p.h ../phonon/../3rdparty/phonon/phonon/effectparameter_p.h ../phonon/../3rdparty/phonon/phonon/effectwidget_p.h ../phonon/../3rdparty/phonon/phonon/factory_p.h ../phonon/../3rdparty/phonon/phonon/frontendinterface_p.h ../phonon/../3rdparty/phonon/phonon/globalconfig_p.h ../phonon/../3rdparty/phonon/phonon/globalstatic_p.h ../phonon/../3rdparty/phonon/phonon/iodevicestream_p.h ../phonon/../3rdparty/phonon/phonon/medianode_p.h ../phonon/../3rdparty/phonon/phonon/medianodedestructionhandler_p.h ../phonon/../3rdparty/phonon/phonon/mediaobject_p.h ../phonon/../3rdparty/phonon/phonon/mediasource_p.h ../phonon/../3rdparty/phonon/phonon/objectdescription_p.h ../phonon/../3rdparty/phonon/phonon/objectdescriptionmodel_p.h ../phonon/../3rdparty/phonon/phonon/path_p.h ../phonon/../3rdparty/phonon/phonon/phonondefs_p.h ../phonon/../3rdparty/phonon/phonon/phononnamespace_p.h ../phonon/../3rdparty/phonon/phonon/platform_p.h ../phonon/../3rdparty/phonon/phonon/qsettingsgroup_p.h ../phonon/../3rdparty/phonon/phonon/seekslider_p.h ../phonon/../3rdparty/phonon/phonon/streaminterface_p.h ../phonon/../3rdparty/phonon/phonon/videowidget_p.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect_p.h ../phonon/../3rdparty/phonon/phonon/volumeslider_p.h 
+SYNCQT.HEADER_FILES = ../phonon/../3rdparty/phonon/phonon/abstractaudiooutput.h ../phonon/../3rdparty/phonon/phonon/abstractmediastream.h ../phonon/../3rdparty/phonon/phonon/abstractvideooutput.h ../phonon/../3rdparty/phonon/phonon/addoninterface.h ../phonon/../3rdparty/phonon/phonon/audiodataoutput.h ../phonon/../3rdparty/phonon/phonon/audiodataoutputinterface.h ../phonon/../3rdparty/phonon/phonon/audiooutput.h ../phonon/../3rdparty/phonon/phonon/audiooutputinterface.h ../phonon/../3rdparty/phonon/phonon/backendcapabilities.h ../phonon/../3rdparty/phonon/phonon/backendinterface.h ../phonon/../3rdparty/phonon/phonon/effect.h ../phonon/../3rdparty/phonon/phonon/effectinterface.h ../phonon/../3rdparty/phonon/phonon/effectparameter.h ../phonon/../3rdparty/phonon/phonon/effectwidget.h ../phonon/../3rdparty/phonon/phonon/globalconfig.h ../phonon/../3rdparty/phonon/phonon/mediacontroller.h ../phonon/../3rdparty/phonon/phonon/medianode.h ../phonon/../3rdparty/phonon/phonon/mediaobject.h ../phonon/../3rdparty/phonon/phonon/mediaobjectinterface.h ../phonon/../3rdparty/phonon/phonon/mediasource.h ../phonon/../3rdparty/phonon/phonon/objectdescription.h ../phonon/../3rdparty/phonon/phonon/objectdescriptionmodel.h ../phonon/../3rdparty/phonon/phonon/path.h ../phonon/../3rdparty/phonon/phonon/phonon_export.h ../phonon/../3rdparty/phonon/phonon/phonondefs.h ../phonon/../3rdparty/phonon/phonon/phononnamespace.h ../phonon/../3rdparty/phonon/phonon/platformplugin.h ../phonon/../3rdparty/phonon/phonon/pulsesupport.h ../phonon/../3rdparty/phonon/phonon/seekslider.h ../phonon/../3rdparty/phonon/phonon/streaminterface.h ../phonon/../3rdparty/phonon/phonon/videoplayer.h ../phonon/../3rdparty/phonon/phonon/videowidget.h ../phonon/../3rdparty/phonon/phonon/videowidgetinterface.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect.h ../phonon/../3rdparty/phonon/phonon/volumefaderinterface.h ../phonon/../3rdparty/phonon/phonon/volumeslider.h ../../include/phonon/phonon ../../include/phonon_compat/Phonon/Phonon 
+SYNCQT.HEADER_CLASSES = ../../include/phonon/AbstractAudioOutput ../../include/phonon/AbstractMediaStream ../../include/phonon/AbstractVideoOutput ../../include/phonon/AddonInterface ../../include/phonon/AudioDataOutput ../../include/phonon/AudioDataOutputInterface ../../include/phonon/AudioOutput ../../include/phonon/AudioOutputInterface40 ../../include/phonon/AudioOutputInterface42 ../../include/phonon/AudioOutputInterface ../../include/phonon/BackendCapabilities ../../include/phonon/BackendInterface ../../include/phonon/Effect ../../include/phonon/EffectInterface ../../include/phonon/EffectParameter ../../include/phonon/EffectWidget ../../include/phonon/GlobalConfig ../../include/phonon/MediaController ../../include/phonon/MediaNode ../../include/phonon/MediaObject ../../include/phonon/MediaObjectInterface ../../include/phonon/MediaSource ../../include/phonon/ObjectDescriptionData ../../include/phonon/ObjectDescription ../../include/phonon/AudioOutputDevice ../../include/phonon/AudioCaptureDevice ../../include/phonon/EffectDescription ../../include/phonon/AudioChannelDescription ../../include/phonon/SubtitleDescription ../../include/phonon/ObjectDescriptionModelData ../../include/phonon/ObjectDescriptionModel ../../include/phonon/AudioOutputDeviceModel ../../include/phonon/AudioCaptureDeviceModel ../../include/phonon/EffectDescriptionModel ../../include/phonon/AudioChannelDescriptionModel ../../include/phonon/SubtitleDescriptionModel ../../include/phonon/Path ../../include/phonon/Global ../../include/phonon/PlatformPlugin ../../include/phonon/PulseSupport ../../include/phonon/SeekSlider ../../include/phonon/StreamInterface ../../include/phonon/VideoPlayer ../../include/phonon/VideoWidget ../../include/phonon/VideoWidgetInterface ../../include/phonon/VideoWidgetInterface44 ../../include/phonon/VideoWidgetInterfaceLatest ../../include/phonon/VolumeFaderEffect ../../include/phonon/VolumeFaderInterface ../../include/phonon/VolumeSlider 
+SYNCQT.PRIVATE_HEADER_FILES = ../phonon/../3rdparty/phonon/phonon/abstractaudiooutput_p.h ../phonon/../3rdparty/phonon/phonon/abstractmediastream_p.h ../phonon/../3rdparty/phonon/phonon/abstractvideooutput_p.h ../phonon/../3rdparty/phonon/phonon/audiodataoutput_p.h ../phonon/../3rdparty/phonon/phonon/audiooutput_p.h ../phonon/../3rdparty/phonon/phonon/audiooutputadaptor_p.h ../phonon/../3rdparty/phonon/phonon/backendcapabilities_p.h ../phonon/../3rdparty/phonon/phonon/effect_p.h ../phonon/../3rdparty/phonon/phonon/effectparameter_p.h ../phonon/../3rdparty/phonon/phonon/effectwidget_p.h ../phonon/../3rdparty/phonon/phonon/factory_p.h ../phonon/../3rdparty/phonon/phonon/frontendinterface_p.h ../phonon/../3rdparty/phonon/phonon/globalconfig_p.h ../phonon/../3rdparty/phonon/phonon/globalstatic_p.h ../phonon/../3rdparty/phonon/phonon/iodevicestream_p.h ../phonon/../3rdparty/phonon/phonon/medianode_p.h ../phonon/../3rdparty/phonon/phonon/medianodedestructionhandler_p.h ../phonon/../3rdparty/phonon/phonon/mediaobject_p.h ../phonon/../3rdparty/phonon/phonon/mediasource_p.h ../phonon/../3rdparty/phonon/phonon/objectdescription_p.h ../phonon/../3rdparty/phonon/phonon/objectdescriptionmodel_p.h ../phonon/../3rdparty/phonon/phonon/path_p.h ../phonon/../3rdparty/phonon/phonon/phonondefs_p.h ../phonon/../3rdparty/phonon/phonon/phononnamespace_p.h ../phonon/../3rdparty/phonon/phonon/platform_p.h ../phonon/../3rdparty/phonon/phonon/qsettingsgroup_p.h ../phonon/../3rdparty/phonon/phonon/seekslider_p.h ../phonon/../3rdparty/phonon/phonon/streaminterface_p.h ../phonon/../3rdparty/phonon/phonon/swiftslider_p.h ../phonon/../3rdparty/phonon/phonon/videowidget_p.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect_p.h ../phonon/../3rdparty/phonon/phonon/volumeslider_p.h 
Index: trunk/include/phonon/phonon
===================================================================
--- trunk/include/phonon/phonon	(revision 769)
+++ trunk/include/phonon/phonon	(revision 846)
@@ -5,4 +5,6 @@
 #include "abstractvideooutput.h"
 #include "addoninterface.h"
+#include "audiodataoutput.h"
+#include "audiodataoutputinterface.h"
 #include "audiooutput.h"
 #include "audiooutputinterface.h"
@@ -13,4 +15,5 @@
 #include "effectparameter.h"
 #include "effectwidget.h"
+#include "globalconfig.h"
 #include "mediacontroller.h"
 #include "medianode.h"
@@ -24,4 +27,5 @@
 #include "phononnamespace.h"
 #include "platformplugin.h"
+#include "pulsesupport.h"
 #include "seekslider.h"
 #include "streaminterface.h"
Index: trunk/include/phonon/private/audiodataoutput_p.h
===================================================================
--- trunk/include/phonon/private/audiodataoutput_p.h	(revision 846)
+++ trunk/include/phonon/private/audiodataoutput_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/phonon/../3rdparty/phonon/phonon/audiodataoutput_p.h"
Index: trunk/include/phonon/private/swiftslider_p.h
===================================================================
--- trunk/include/phonon/private/swiftslider_p.h	(revision 846)
+++ trunk/include/phonon/private/swiftslider_p.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../../src/phonon/../3rdparty/phonon/phonon/swiftslider_p.h"
Index: trunk/include/phonon/pulsesupport.h
===================================================================
--- trunk/include/phonon/pulsesupport.h	(revision 846)
+++ trunk/include/phonon/pulsesupport.h	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/pulsesupport.h"
Index: trunk/include/phonon_compat/Phonon/AudioDataOutput
===================================================================
--- trunk/include/phonon_compat/Phonon/AudioDataOutput	(revision 846)
+++ trunk/include/phonon_compat/Phonon/AudioDataOutput	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../phonon/audiodataoutput.h"
Index: trunk/include/phonon_compat/Phonon/AudioDataOutputInterface
===================================================================
--- trunk/include/phonon_compat/Phonon/AudioDataOutputInterface	(revision 846)
+++ trunk/include/phonon_compat/Phonon/AudioDataOutputInterface	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../phonon/audiodataoutputinterface.h"
Index: trunk/include/phonon_compat/Phonon/GlobalConfig
===================================================================
--- trunk/include/phonon_compat/Phonon/GlobalConfig	(revision 846)
+++ trunk/include/phonon_compat/Phonon/GlobalConfig	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../phonon/globalconfig.h"
Index: trunk/include/phonon_compat/Phonon/Phonon
===================================================================
--- trunk/include/phonon_compat/Phonon/Phonon	(revision 769)
+++ trunk/include/phonon_compat/Phonon/Phonon	(revision 846)
@@ -5,4 +5,6 @@
 #include "abstractvideooutput.h"
 #include "addoninterface.h"
+#include "audiodataoutput.h"
+#include "audiodataoutputinterface.h"
 #include "audiooutput.h"
 #include "audiooutputinterface.h"
@@ -13,4 +15,5 @@
 #include "effectparameter.h"
 #include "effectwidget.h"
+#include "globalconfig.h"
 #include "mediacontroller.h"
 #include "medianode.h"
@@ -24,4 +27,5 @@
 #include "phononnamespace.h"
 #include "platformplugin.h"
+#include "pulsesupport.h"
 #include "seekslider.h"
 #include "streaminterface.h"
Index: trunk/include/phonon_compat/Phonon/PulseSupport
===================================================================
--- trunk/include/phonon_compat/Phonon/PulseSupport	(revision 846)
+++ trunk/include/phonon_compat/Phonon/PulseSupport	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../phonon/pulsesupport.h"
Index: trunk/include/phonon_compat/Phonon/VideoWidgetInterface44
===================================================================
--- trunk/include/phonon_compat/Phonon/VideoWidgetInterface44	(revision 846)
+++ trunk/include/phonon_compat/Phonon/VideoWidgetInterface44	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../phonon/videowidgetinterface.h"
Index: trunk/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest
===================================================================
--- trunk/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest	(revision 846)
+++ trunk/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest	(revision 846)
@@ -0,0 +1,1 @@
+#include "../../phonon/videowidgetinterface.h"
