diff --git a/common.pri b/common.pri
new file mode 100644
index 0000000000000000000000000000000000000000..844ef5edbe6c755c52ed80ae4100d95b11a1b5fe
--- /dev/null
+++ b/common.pri
@@ -0,0 +1,6 @@
+macx:LIBPATH = $$getOutDir()/$$getConfigDir()
+else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
+
+# Allows examples/tests to link to libQt5WebEngineCore which
+# isn't deployed properly yet.
+QMAKE_RPATHDIR += $$LIBPATH
diff --git a/examples/common.pri b/examples/common.pri
deleted file mode 100644
index dac92e8659f3d76300bae08af2b495e86baa8a42..0000000000000000000000000000000000000000
--- a/examples/common.pri
+++ /dev/null
@@ -1,15 +0,0 @@
-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)
-
-QMAKE_RPATHDIR += $$LIBPATH
-
-# Quick hack for now as we mess with that for the gyp generation step.
-MOC_DIR=$$PWD/.moc
-
diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/quick/quicknanobrowser/quicknanobrowser.pro
index da71b034c364a48220776889fe9ba29de9f8653b..c32540a71e03761f00ad6e6eeb57c53cc25454f2 100644
--- a/examples/quick/quicknanobrowser/quicknanobrowser.pro
+++ b/examples/quick/quicknanobrowser/quicknanobrowser.pro
@@ -1,14 +1,15 @@
 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) {
diff --git a/examples/quick/quicknanobrowser/quickwindow.cpp b/examples/quick/quicknanobrowser/quickwindow.cpp
index 1f753c691dfd83d20ec2f8f60e1fd976b8455c2f..3b89aa2058204b8586180793e227f1837e9b526a 100644
--- a/examples/quick/quicknanobrowser/quickwindow.cpp
+++ b/examples/quick/quicknanobrowser/quickwindow.cpp
@@ -41,7 +41,7 @@
 
 #include "quickwindow.h"
 
-#include "util.h"
+#include "../../common/util.h"
 
 #include <QFileInfo>
 #include <QObject>
diff --git a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
index 4a4cefd429ae8f01fd96d542e795f1a64f3d65bd..bd9e53a90ed7ad6417bd300dd039c68feea310f3 100644
--- a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
+++ b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
@@ -1,9 +1,11 @@
 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
diff --git a/examples/widgets/widgetsnanobrowser/widgetwindow.cpp b/examples/widgets/widgetsnanobrowser/widgetwindow.cpp
index a1ab56d0ae80f050aaf46f34209ddd3aed986795..1b83e89dd6125e70b8512d2fb07f73b86069465d 100644
--- a/examples/widgets/widgetsnanobrowser/widgetwindow.cpp
+++ b/examples/widgets/widgetsnanobrowser/widgetwindow.cpp
@@ -42,7 +42,7 @@
 #include "widgetwindow.h"
 
 #include "qwebcontentsview.h"
-#include "util.h"
+#include "../../common/util.h"
 
 #include <QShortcut>