diff options
-rw-r--r-- | common.pri | 6 | ||||
-rw-r--r-- | examples/common.pri | 15 | ||||
-rw-r--r-- | examples/quick/quicknanobrowser/quicknanobrowser.pro | 5 | ||||
-rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro | 4 | ||||
-rw-r--r-- | examples/widgets/widgetsnanobrowser/widgetwindow.cpp | 2 |
6 files changed, 14 insertions, 20 deletions
diff --git a/common.pri b/common.pri new file mode 100644 index 000000000..844ef5edb --- /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 dac92e865..000000000 --- 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 da71b034c..c32540a71 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 1f753c691..3b89aa205 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 4a4cefd42..bd9e53a90 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 a1ab56d0a..1b83e89dd 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> |