fix bad merge
commit6a4311ab83efcdbbc15e6a19d03fe9e090699158
authorMichael Zanetti <michael.zanetti@canonical.com>
dateTue 9 Jul 2013, 22:33 (13 years ago)
parentaf46006
plugins/Unity/CMakeLists.txt+2
@@ -46,3 +46,5 @@ qt5_use_modules(Unity-qml Qml)
4646
4747# export the qmldir and qmltypes files
4848export_qmlplugin(Unity 0.1 Unity TARGETS Unity-qml)
49+
50+add_subdirectory(Launcher)
plugins/Unity/Launcher/backend/launcherbackend.h+1
@@ -23,6 +23,7 @@
2323
2424#include <QObject>
2525#include <QStringList>
26+#include <QHash>
2627
2728/**
2829 * @brief An interface that provides all the data needed by the launcher.