← Back to branch summary

~mir-team/qtmir/trunk

« back to all changes in this revision

Viewing changes to demos/paths.h.in

  • Committer: Bileto Bot
  • Author(s): Albert Astals Cid, Gerry Boland
  • Date: 2017-03-20 21:15:13 UTC
  • mfrom: (606.4.12 make_sure_surface_not_null)
  • Revision ID: ci-train-bot@canonical.com-20170320211513-z7v3z0ldes3gtcc0
Check for find() result not being null before using it

We do it in onWindowReady, onWindowMoved, onWindowFocusChanged, etc so no reason to not do it in onWindowRemoved

Approved by: Lukáš Tinkl, Unity8 CI Bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
demos/paths.h.in
37
37
        return QString("@CMAKE_SOURCE_DIR@/demos/");
38
38
    }
39
39
}
40
 
#endif
 
 
b'\\ No newline at end of file'
 
40
 
 
41
inline QString qmlPluginDirectory() {
 
42
    if (isRunningInstalled()) {
 
43
        return QString("@QML_MODULE_INSTALL_DIR@/");
 
44
    } else {
 
45
        return QString("@CMAKE_BINARY_DIR@/src/modules/");
 
46
    }
 
47
}
 
48
 
 
49
inline QString qpaPluginDirectory() {
 
50
    if (isRunningInstalled()) {
 
51
        return QString("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/qt5/plugins/platforms/");
 
52
    } else {
 
53
        return QString("@CMAKE_BINARY_DIR@/src/platforms/mirserver/");
 
54
    }
 
55
}
 
56
 
 
57
#endif
 
58