Fix 4.8 and 4.7 build for linux

7 files changed, 11 insertions, 9 deletions

diff --git a/src/serviceframework/ipc/metaobjectbuilder.pri b/src/serviceframework/ipc/metaobjectbuilder.pri
index cc905f9995..561bddb512 100644
--- a/src/serviceframework/ipc/metaobjectbuilder.pri
+++ b/src/serviceframework/ipc/metaobjectbuilder.pri
@@ -1,12 +1,12 @@
 #check version for 4.7 ...
 contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 8) {
-  OBJECTBUILDER_INCLUDEPATH += ipc
-  OBJECTBUILDER_DEPENDPATH += ipc
-  OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_47_p.h
-  OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder_47.cpp
+  OBJECTBUILDER_INCLUDEPATH += ipc/metaobjectbuilder47
+  OBJECTBUILDER_DEPENDPATH += ipc/metaobjectbuilder47
+  OBJECTBUILDER_HEADERS += ipc/metaobjectbuilder47/qmetaobjectbuilder_p.h
+  OBJECTBUILDER_SOURCES += ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp
 } else {
-  OBJECTBUILDER_INCLUDEPATH += ipc
-  OBJECTBUILDER_DEPENDPATH += ipc
-  OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_p.h
-  OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder.cpp
+  OBJECTBUILDER_INCLUDEPATH += ipc/metaobjectbuilder
+  OBJECTBUILDER_DEPENDPATH += ipc/metaobjectbuilder
+  OBJECTBUILDER_HEADERS += ipc/metaobjectbuilder/qmetaobjectbuilder_p.h
+  OBJECTBUILDER_SOURCES += ipc/metaobjectbuilder/qmetaobjectbuilder.cpp
 }
diff --git a/src/serviceframework/ipc/qmetaobjectbuilder.cpp b/src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder.cpp
index 88e2901dec..88e2901dec 100644
--- a/src/serviceframework/ipc/qmetaobjectbuilder.cpp
+++ b/src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder.cpp
diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_p.h b/src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder_p.h
index 7f29ddc057..7f29ddc057 100644
--- a/src/serviceframework/ipc/qmetaobjectbuilder_p.h
+++ b/src/serviceframework/ipc/metaobjectbuilder/qmetaobjectbuilder_p.h
diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp b/src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp
index 509d6c67e7..509d6c67e7 100644
--- a/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp
+++ b/src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder.cpp
diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_47_p.h b/src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder_p.h
index 5f25e0f80d..5f25e0f80d 100644
--- a/src/serviceframework/ipc/qmetaobjectbuilder_47_p.h
+++ b/src/serviceframework/ipc/metaobjectbuilder47/qmetaobjectbuilder_p.h
diff --git a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
index dd47272796..831e319a3a 100644
--- a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
+++ b/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
@@ -1,6 +1,8 @@
 TARGET = tst_qmetaobjectbuilder
 INCLUDEPATH += ../../../src/serviceframework
 INCLUDEPATH += ../../../src/serviceframework/ipc
+include(../../../src/serviceframework/ipc/metaobjectbuilder.pri)
+INCLUDEPATH += ../../../src/serviceframework/$$OBJECTBUILDER_INCLUDEPATH
 
 CONFIG+=testcase
 
diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp
index 96a7eca277..7c2bc7339a 100644
--- a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp
+++ b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp
@@ -44,7 +44,7 @@
 #include <qmobilityglobal.h>
 #include <QtTest/QtTest>
 #include <QtCore/qlocale.h>
-#include <qmetaobjectbuilder_47_p.h>
+#include <qmetaobjectbuilder_p.h>
 
 QTM_USE_NAMESPACE