diff options
author | aavit <eirik.aavitsland@digia.com> | 2014-01-17 10:04:40 +0100 |
---|---|---|
committer | aavit <eirik.aavitsland@digia.com> | 2014-01-17 10:06:10 +0100 |
commit | 4e6b5d1c692bdcacdbf09955af67fc930c9a35a5 (patch) | |
tree | 3dc00ed63e88301f1c4ebeaeb353cca69f2103cb /src/utils/utils.pro | |
parent | 5980f4bff613e109375d3d841b2891847011074d (diff) | |
parent | 59649939d06664d722046cd54e0933c5b402e9a9 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/doc/src/b2qt.qdoc
Change-Id: I9d345dcc689e751b997df797ce12b6cd8a14ffb9
Diffstat (limited to 'src/utils/utils.pro')
-rw-r--r-- | src/utils/utils.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/utils.pro b/src/utils/utils.pro index 5711337..a15231f 100644 --- a/src/utils/utils.pro +++ b/src/utils/utils.pro @@ -11,7 +11,7 @@ QT = core network MODULE = droidutils load(qt_module) -android: LIBS += -lmedia -lhardware -lcutils +android: LIBS += -lmedia -lhardware -lcutils -lutils HEADERS += \ $$PWD/qdroidutils.h |