Merge remote-tracking branch 'base/master' into refactor

Conflicts:
	demos/demos.pro
	demos/embedded/digiflip/digiflip.pro
	examples/examples.pro
	examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
	src/gui/kernel/qplatformglcontext_qpa.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
	src/plugins/platforms/wayland/qwaylanddisplay.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp

Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745

1 files changed, 1 insertions, 28 deletions

diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 41a3a4fc93..eaafd0a9fd 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -67,34 +67,7 @@ static QByteArray combinePath(const char *infile, const char *outfile)
 {
     QFileInfo inFileInfo(QDir::current(), QFile::decodeName(infile));
     QFileInfo outFileInfo(QDir::current(), QFile::decodeName(outfile));
-    int numCommonComponents = 0;
-
-    QStringList inSplitted = inFileInfo.dir().canonicalPath().split(QLatin1Char('/'));
-    QStringList outSplitted = outFileInfo.dir().canonicalPath().split(QLatin1Char('/'));
-
-    while (!inSplitted.isEmpty() && !outSplitted.isEmpty() &&
-            inSplitted.first() == outSplitted.first()) {
-        inSplitted.removeFirst();
-        outSplitted.removeFirst();
-        numCommonComponents++;
-    }
-
-    if (numCommonComponents < 2)
-        /*
-          The paths don't have the same drive, or they don't have the
-          same root directory. Use an absolute path.
-        */
-        return QFile::encodeName(inFileInfo.absoluteFilePath());
-    /*
-       The paths have something in common. Use a path relative to
-       the output file.
-     */
-    while (!outSplitted.isEmpty()) {
-        outSplitted.removeFirst();
-        inSplitted.prepend(QLatin1String(".."));
-    }
-    inSplitted.append(inFileInfo.fileName());
-    return QFile::encodeName(inSplitted.join(QLatin1String("/")));
+    return QFile::encodeName(outFileInfo.dir().relativeFilePath(inFileInfo.filePath()));
 }