projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Initial Qt5 port
[harmattan/cameraplus]
/
declarative
/
cameraconfig.cpp
diff --git
a/declarative/cameraconfig.cpp
b/declarative/cameraconfig.cpp
index
6085ed5
..
1c1678a
100644
(file)
--- a/
declarative/cameraconfig.cpp
+++ b/
declarative/cameraconfig.cpp
@@
-22,7
+22,11
@@
#include "cameraconfig.h"
#include "qtcamconfig.h"
+#if defined(QT4)
#include <QDeclarativeInfo>
+#elif defined(QT5)
+#include <QQmlInfo>
+#endif
CameraConfig::CameraConfig(QObject *parent) :
QObject(parent),