← Back to branch summary

~jocave/checkbox/hybrid-amd-gpu-mods

« back to all changes in this revision

Viewing changes to plainbox-gui/gui-ihv/main.cpp

  • Committer: Andrew Haigh
  • Date: 2013-07-25 09:49:14 UTC
  • mfrom: (2229.5.2 engine)
  • mto: (2229.6.3 gui)
  • mto: This revision was merged to the branch mainline in revision 2553.
  • Revision ID: andrew.haigh@cellsoftware.co.uk-20130725094914-xyups9qn7oj5ti1q
Resolved merge of catchup of checkbox-ihv-ng

Show diffs side-by-side

added added

removed removed

Lines of Context:
plainbox-gui/gui-ihv/main.cpp
25
25
#include <QDir>
26
26
#include <QtQml>
27
27
#include "qtquick2applicationviewer.h"
28
 
 
29
 
 
 
28
#include "commandtool.h"
30
29
#include "listmodel.h"
31
30
#include "whitelistitem.h"
32
31
#include "testitem.h"
231
230
    // List of Tests
232
231
    viewer.rootContext()->setContextProperty("testListModel", testlistmodel);
233
232
 
 
233
    CommandTool cmdTool;
 
234
    viewer.rootContext()->setContextProperty("cmdTool", &cmdTool);
 
235
 
234
236
    // GuiEngine
235
237
    viewer.rootContext()->setContextProperty("guiEngine", &guiengine);
236
238