← Back to branch summary

~osomon/oxide/override-touchUngrabEvent

« back to all changes in this revision

Viewing changes to qt/core/core.gyp

  • Committer: Chris Coulson
  • Date: 2016-01-13 18:16:11 UTC
  • Revision ID: chris.coulson@canonical.com-20160113181611-vo55lgwngvcj9u1h
https://launchpad.net/bugs/1533710
https://launchpad.net/bugs/1432059
Various clean-ups in soon-to-be-public headers. Also, we rename header files based on whether they're going to be public or not

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/core/core.gyp
21
21
      'type': 'shared_library',
22
22
      'product_extension': 'so.<(oxide_core_so_version)',
23
23
      'defines': [
 
24
        'OXIDE_QTCORE_IMPLEMENTATION',
24
25
        'QT_NO_SIGNALS_SLOTS_KEYWORDS',
25
26
      ],
26
27
      'dependencies': [
51
52
      'include_dirs': [
52
53
        '../..',
53
54
        '<(INTERMEDIATE_DIR)',
54
 
        '<(DEPTH)'
 
55
        'api/includes',
 
56
        '<(DEPTH)',
55
57
      ],
56
58
      'ldflags': [
57
59
        '-Wl,-rpath=\$$ORIGIN/<(oxide_subprocess_dir)',
62
64
        '<(INTERMEDIATE_DIR)/moc_oxideqhttpauthenticationrequest.cc',
63
65
        '<(INTERMEDIATE_DIR)/moc_oxideqloadevent.cc',
64
66
        '<(INTERMEDIATE_DIR)/moc_oxideqmediacapturedevices.cc',
65
 
        '<(INTERMEDIATE_DIR)/moc_oxideqnetworkcallbackevents.cc',
 
67
        '<(INTERMEDIATE_DIR)/moc_oxideqnetworkcallbackevents_p.cc',
66
68
        '<(INTERMEDIATE_DIR)/moc_oxideqnavigationrequest.cc',
67
69
        '<(INTERMEDIATE_DIR)/moc_oxideqnewviewrequest.cc',
68
70
        '<(INTERMEDIATE_DIR)/moc_oxideqpermissionrequest.cc',
89
91
        'api/oxideqmediacapturedevices.h',
90
92
        'api/oxideqmediacapturedevices_p.h',
91
93
        'api/oxideqnetworkcallbackevents.cc',
92
 
        'api/oxideqnetworkcallbackevents.h',
93
94
        'api/oxideqnetworkcallbackevents_p.h',
 
95
        'api/oxideqnetworkcallbackevents_p_p.h',
94
96
        'api/oxideqnavigationrequest.cc',
95
97
        'api/oxideqnavigationrequest.h',
96
98
        'api/oxideqnewviewrequest.cc',
228
230
          'includes': [ 'moc.gypi' ]
229
231
        },
230
232
        {
231
 
          'action_name': 'moc_oxideqnetworkcallbackevents.cc',
232
 
          'moc_input': 'api/oxideqnetworkcallbackevents.h',
 
233
          'action_name': 'moc_oxideqnetworkcallbackevents_p.cc',
 
234
          'moc_input': 'api/oxideqnetworkcallbackevents_p.h',
233
235
          'includes': [ 'moc.gypi' ],
234
236
        },
235
237
        {