Detach common.pri from the nano browser examples.

Move common.pri to the root directory to be able to use it with tests.
Remove nano browser specific logic (util.h include and common resources)
from this file and use relative paths in the examples instead.

This also remove unnecessary directives:
- lib doesn't have to be added to INCLUDEPATH since proper modules are used
- util.h doesn't need to be added to HEADERS, moc doesn't need to go through it
- MOC_DIR doesn't have to be adjusted anymore

Change-Id: Id706e7f2ef7c9607bdcd0ba63afecf5b5854262b
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

examples/common.pri → common.pri

-INCLUDEPATH += $$absolute_path(../lib, $$PWD) \
-               $$absolute_path(common, $$PWD)
-
 macx:LIBPATH = $$getOutDir()/$$getConfigDir()
 else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
 
-HEADERS += common/util.h
-
-RESOURCES += $$absolute_path(common/common_resources.qrc)
-
+# Allows examples/tests to link to libQt5WebEngineCore which
+# isn't deployed properly yet.
 QMAKE_RPATHDIR += $$LIBPATH
-
-# Quick hack for now as we mess with that for the gyp generation step.
-MOC_DIR=$$PWD/.moc
-

examples/quick/quicknanobrowser/quicknanobrowser.pro

 TEMPLATE = app
 TARGET = quicknanobrowser
 
-include(../../common.pri)
+include($$QTWEBENGINE_ROOT/common.pri)
 
 HEADERS = quickwindow.h
 SOURCES = quickwindow.cpp main.cpp
 
 OTHER_FILES += quickwindow.qml
-RESOURCES += resources.qrc
 
+RESOURCES += resources.qrc
+RESOURCES += ../../common/common_resources.qrc
 
 QT += qml quick
 qtHaveModule(widgets) {

examples/quick/quicknanobrowser/quickwindow.cpp

@@ -41,7 +41,7 @@
 
 #include "quickwindow.h"
 
-#include "util.h"
+#include "../../common/util.h"
 
 #include <QFileInfo>
 #include <QObject>

examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro

 TEMPLATE = app
 TARGET = widgetsnanobrowser
 
-include(../../common.pri)
+include($$QTWEBENGINE_ROOT/common.pri)
 
 HEADERS = widgetwindow.h
 SOURCES = widgetwindow.cpp main.cpp
 
+RESOURCES += ../../common/common_resources.qrc
+
 QT += webenginewidgets

examples/widgets/widgetsnanobrowser/widgetwindow.cpp

@@ -42,7 +42,7 @@
 #include "widgetwindow.h"
 
 #include "qwebcontentsview.h"
-#include "util.h"
+#include "../../common/util.h"
 
 #include <QShortcut>