deal with some include directive issues

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d534c2..66616fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/staticlib")
 set(CMAKE_C_VISIBILITY_PRESET "hidden")
 set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
 
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C++ toolkit derived from the Qt 4.8 framework")

diff --git a/src/3rdparty/javascriptcore/interpreter/Interpreter.cpp b/src/3rdparty/javascriptcore/interpreter/Interpreter.cpp
index bb63289..a50853b 100644 (file)
--- a/src/3rdparty/javascriptcore/interpreter/Interpreter.cpp
+++ b/src/3rdparty/javascriptcore/interpreter/Interpreter.cpp
@@ -57,11 +57,12 @@
 #include "RegExpPrototype.h"
 #include "Register.h"
 #include "SamplingTool.h"
-#include <limits.h>
-#include <stdio.h>
 #include <wtf/Threading.h>
 
-#include "bridge/qscriptobject_p.h"
+#include "qscriptobject_p.h"
+
+#include <limits.h>
+#include <stdio.h>
 
 using namespace std;
 

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index df25c14..9694907 100644 (file)
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -36,6 +36,8 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
     ${CMAKE_BINARY_DIR}/include/QtXml
     ${CMAKE_BINARY_DIR}/privateinclude/QtXml
+    ${CMAKE_BINARY_DIR}/include/QtDBus
+    ${CMAKE_BINARY_DIR}/privateinclude/QtDBus
     ${DBUS_INCLUDES}
 )
 

diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index c1df710..f7078f3 100644 (file)
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -50,6 +50,10 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src
 )
 
+set(DECLARATIVE_HEADERS
+    ${DECLARATIVE_HEADERS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/qdeclarativecommon_p.h
+)
 katie_generate_misc("${DECLARATIVE_HEADERS}" QtDeclarative)
 katie_generate_public("${DECLARATIVE_PUBLIC_HEADERS}" QtDeclarative)
 katie_generate_package(KtDeclarative "KtCore KtGui KtNetwork KtScript")

diff --git a/src/designer/components/CMakeLists.txt b/src/designer/components/CMakeLists.txt
index e833407..ccccfa2 100644 (file)
--- a/src/designer/components/CMakeLists.txt
+++ b/src/designer/components/CMakeLists.txt
@@ -10,14 +10,6 @@ include(tabordereditor/tabordereditor.cmake)
 include(taskmenu/taskmenu.cmake)
 include(widgetbox/widgetbox.cmake)
 
-set(DESIGNERCOMPONENTS_PUBLIC_HEADERS
-    ${DESIGNERCOMPONENTS_PUBLIC_HEADERS}
-)
-
-set(DESIGNERCOMPONENTS_HEADERS
-    ${DESIGNERCOMPONENTS_HEADERS}
-)
-
 set(DESIGNERCOMPONENTS_SOURCES
     ${DESIGNERCOMPONENTS_SOURCES}
     ${CMAKE_CURRENT_SOURCE_DIR}/qdesigner_components.cpp

diff --git a/src/designer/components/qdesigner_components.cpp b/src/designer/components/qdesigner_components.cpp
index 90868f7..a7a8b4b 100644 (file)
--- a/src/designer/components/qdesigner_components.cpp
+++ b/src/designer/components/qdesigner_components.cpp
@@ -41,22 +41,21 @@
 
 #include <QtDesigner/qdesigner_components.h>
 
-#include <actioneditor_p.h>
-#include <widgetdatabase_p.h>
-#include <widgetfactory_p.h>
-
-#include <formeditor/formeditor.h>
-#include <widgetbox/widgetbox.h>
-#include <propertyeditor/propertyeditor.h>
-#include <objectinspector/objectinspector.h>
-#include <taskmenu/taskmenu_component.h>
+#include "actioneditor_p.h"
+#include "widgetdatabase_p.h"
+#include "widgetfactory_p.h"
 #include "qtresourceview_p.h"
 #include "qdesigner_integration_p.h"
-#include <signalsloteditor/signalsloteditorwindow.h>
 
-#include <buddyeditor/buddyeditor_plugin.h>
-#include <signalsloteditor/signalsloteditor_plugin.h>
-#include <tabordereditor/tabordereditor_plugin.h>
+#include "formeditor/formeditor.h"
+#include "widgetbox/widgetbox.h"
+#include "propertyeditor/propertyeditor.h"
+#include "objectinspector/objectinspector.h"
+#include "taskmenu/taskmenu_component.h"
+#include "signalsloteditor/signalsloteditorwindow.h"
+#include "buddyeditor/buddyeditor_plugin.h"
+#include "signalsloteditor/signalsloteditor_plugin.h"
+#include "tabordereditor/tabordereditor_plugin.h"
 
 #include <QtDesigner/abstractlanguage.h>
 #include <QtDesigner/QExtensionManager>

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index b7aa141..9e338b7 100644 (file)
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -59,12 +59,12 @@
 #include "PropertyNameArray.h"
 #include "Operations.h"
 
-#include "bridge/qscriptfunction_p.h"
-#include "bridge/qscriptclassobject_p.h"
-#include "bridge/qscriptvariant_p.h"
-#include "bridge/qscriptqobject_p.h"
-#include "bridge/qscriptglobalobject_p.h"
-#include "bridge/qscriptstaticscopeobject_p.h"
+#include "qscriptfunction_p.h"
+#include "qscriptclassobject_p.h"
+#include "qscriptvariant_p.h"
+#include "qscriptqobject_p.h"
+#include "qscriptglobalobject_p.h"
+#include "qscriptstaticscopeobject_p.h"
 
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qcoreapplication.h>

diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 2a244a6..35ca61a 100644 (file)
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -45,13 +45,13 @@
 #include <QtCore/qstringlist.h>
 #include "qscriptvalue_p.h"
 #include "qscriptstring_p.h"
-#include "bridge/qscriptclassobject_p.h"
-#include "bridge/qscriptdeclarativeclass_p.h"
-#include "bridge/qscriptdeclarativeobject_p.h"
-#include "bridge/qscriptobject_p.h"
-#include "bridge/qscriptqobject_p.h"
-#include "bridge/qscriptvariant_p.h"
-#include "bridge/qscriptactivationobject_p.h"
+#include "qscriptclassobject_p.h"
+#include "qscriptdeclarativeclass_p.h"
+#include "qscriptdeclarativeobject_p.h"
+#include "qscriptobject_p.h"
+#include "qscriptqobject_p.h"
+#include "qscriptvariant_p.h"
+#include "qscriptactivationobject_p.h"
 
 #include "DateConstructor.h"
 #include "DateInstance.h"

diff --git a/src/tools/lupdate/qscript.cpp b/src/tools/lupdate/qscript.cpp
index b9d2c24..5c735f0 100644 (file)
--- a/src/tools/lupdate/qscript.cpp
+++ b/src/tools/lupdate/qscript.cpp
@@ -755,8 +755,8 @@ public:
 
 #define Q_SCRIPT_REGEXPLITERAL_RULE2 8
 
-#include <lupdate.h>
-#include <translator.h>
+#include "lupdate.h"
+#include "translator.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/qdebug.h>

diff --git a/src/tools/lupdate/qscript.g b/src/tools/lupdate/qscript.g
index 9b86165..4d98bee 100644 (file)
--- a/src/tools/lupdate/qscript.g
+++ b/src/tools/lupdate/qscript.g
@@ -81,8 +81,8 @@
 %start Program
 
 /.
-#include <lupdate.h>
-#include <translator.h>
+#include "lupdate.h"
+#include "translator.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/qdebug.h>

diff --git a/src/tools/qtconfig/CMakeLists.txt b/src/tools/qtconfig/CMakeLists.txt
index 9d6ff6b..376afb5 100644 (file)
--- a/src/tools/qtconfig/CMakeLists.txt
+++ b/src/tools/qtconfig/CMakeLists.txt
@@ -8,6 +8,8 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
     ${CMAKE_BINARY_DIR}/include/QtGui
     ${CMAKE_BINARY_DIR}/privateinclude/QtGui
+    # for UI file includes
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 set(QTCONFIG_SOURCES

diff --git a/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp b/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp
index 22cb2ec..b9c5316 100644 (file)
--- a/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp
+++ b/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp
@@ -177,4 +177,4 @@ private slots:
 
 QTEST_MAIN(bench_QDir_10000)
 
-#include "10000/moc_bench_qdir_10000.cpp"
+#include "moc_bench_qdir_10000.cpp"

diff --git a/tests/benchmarks/core/io/qdir/tree/bench_qdir_tree.cpp b/tests/benchmarks/core/io/qdir/tree/bench_qdir_tree.cpp
index e24a1e2..9ef8f8c 100644 (file)
--- a/tests/benchmarks/core/io/qdir/tree/bench_qdir_tree.cpp
+++ b/tests/benchmarks/core/io/qdir/tree/bench_qdir_tree.cpp
@@ -240,5 +240,5 @@ private:
 
 QTEST_MAIN(bench_QDir_tree)
 
-#include "tree/moc_bench_qdir_tree.cpp"
-#include "tree/qrc_bench_qdir_tree.cpp"
+#include "moc_bench_qdir_tree.cpp"
+#include "qrc_bench_qdir_tree.cpp"