diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-13 12:21:25 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-19 18:55:45 +0200 |
| commit | b6b4418db975e3c6003376b28f74d669cdf58ea4 (patch) | |
| tree | b151b1f3760435148bcc9b583fb3a415a87cb388 /examples/quick | |
| parent | 6713e9266b5df317109f1645ac516346a6f9a44c (diff) | |
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>
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/quicknanobrowser/quicknanobrowser.pro | 5 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
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> |