Skip to content

Commit 38efcf0

Browse files
committed
build pugixml with ext_qt_base
1 parent e963c0e commit 38efcf0

File tree

5 files changed

+2
-42
lines changed

5 files changed

+2
-42
lines changed

pugixml.gyp

Lines changed: 0 additions & 27 deletions
This file was deleted.

wd.gyp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
'target_name': 'All',
1111
'type': 'none',
1212
'dependencies': [
13-
'pugixml.gyp:pugixml',
1413
'base.gyp:chromium_base',
1514
'wd_core.gyp:WebDriver_core',
1615
'wd_ext_qt.gyp:WebDriver_extension_qt_base',

wd_common.gypi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
'WD_CONFIG_QWIDGET_VIEW%': '0',
55
'WD_CONFIG_QML_VIEW%': '0',
66
'WD_BUILD_MONGOOSE%': '0',
7-
'WD_CONFIG_XPATH%': '1',
87

98
'conditions': [
109

wd_ext_qt.gyp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,10 @@
4949
'<(INTERMEDIATE_DIR)/moc_vncclient.cc',
5050
'src/vnc/vncserverparameters.cc',
5151
'src/webdriver/extension_qt/vnc_event_dispatcher.cc',
52-
'src/webdriver/extension_qt/wd_event_dispatcher.cc'
52+
'src/webdriver/extension_qt/wd_event_dispatcher.cc',
53+
'src/third_party/pugixml/pugixml.cpp'
5354
],
5455

55-
'conditions': [
56-
57-
[ '<(WD_CONFIG_XPATH) == 1', {
58-
'defines': [
59-
'WD_CONFIG_XPATH',
60-
],
61-
} ],
62-
63-
],
6456
}, {
6557
'target_name': 'WebDriver_extension_qt_web',
6658
'type': 'static_library',

wd_test.gyp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@
176176
'product_name': 'WebDriver',
177177

178178
'dependencies': [
179-
'pugixml.gyp:pugixml',
180179
'base.gyp:chromium_base',
181180
'wd_core.gyp:WebDriver_core',
182181
'wd_ext_qt.gyp:WebDriver_extension_qt_base',
@@ -239,7 +238,6 @@
239238
'product_name': 'WebDriver_noWebkit',
240239

241240
'dependencies': [
242-
'pugixml.gyp:pugixml',
243241
'base.gyp:chromium_base',
244242
'wd_core.gyp:WebDriver_core',
245243
'wd_ext_qt.gyp:WebDriver_extension_qt_base',
@@ -266,7 +264,6 @@
266264
'product_name': 'WebDriver_noWebkit_sharedLibs',
267265

268266
'dependencies': [
269-
'pugixml.gyp:pugixml',
270267
'base.gyp:chromium_base_shared',
271268
'wd_core.gyp:WebDriver_core_shared',
272269
'wd_ext_qt.gyp:WebDriver_extension_qt_base_shared',

0 commit comments

Comments
 (0)