API tools faq
paste
Guest User

Untitled

a guest
Jul 20th, 2018
165
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 24.22 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
  2. index 4cb9d0f..178fe2e 100644
  3. --- a/Source/JavaScriptCore/ChangeLog
  4. +++ b/Source/JavaScriptCore/ChangeLog
  5. @@ -1,3 +1,12 @@
  6. +2011-01-19 Csaba Osztrogonác <ossy@webkit.org>
  7. +
  8. + Reviewed by NOBODY (OOPS!).
  9. +
  10. + [Qt] Remove unnecessary "../Source" from paths
  11. + after moving source files into Source is finished.
  12. +
  13. + * JavaScriptCore.pri:
  14. +
  15. 2011-01-18 Kenneth Russell <kbr@google.com>
  16.  
  17. Unreviewed, rolling out r76078.
  18. diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
  19. index 222f664..a6ddef3 100644
  20. --- a/Source/JavaScriptCore/JavaScriptCore.pri
  21. +++ b/Source/JavaScriptCore/JavaScriptCore.pri
  22. @@ -23,7 +23,6 @@ CONFIG(standalone_package): DEFINES *= NDEBUG
  23. JAVASCRIPTCORE_INCLUDEPATH = \
  24. $$PWD \
  25. $$PWD/.. \
  26. - $$PWD/../.. \ # FIXME: Remove this include once we finish moving the source to Source
  27. $$PWD/assembler \
  28. $$PWD/bytecode \
  29. $$PWD/bytecompiler \
  30. diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
  31. index 078ec99..0d9df7b 100644
  32. --- a/Source/WebCore/ChangeLog
  33. +++ b/Source/WebCore/ChangeLog
  34. @@ -1,3 +1,13 @@
  35. +2011-01-19 Csaba Osztrogonác <ossy@webkit.org>
  36. +
  37. + Reviewed by NOBODY (OOPS!).
  38. +
  39. + [Qt] Remove unnecessary "../Source" from paths
  40. + after moving source files into Source is finished.
  41. +
  42. + * WebCore.pri:
  43. + * WebCore.pro:
  44. +
  45. 2011-01-19 Alexander Pavlov <apavlov@chromium.org>
  46.  
  47. Reviewed by Pavel Feldman.
  48. diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
  49. index 736d534..2f3a1fb 100644
  50. --- a/Source/WebCore/WebCore.pri
  51. +++ b/Source/WebCore/WebCore.pri
  52. @@ -747,10 +747,10 @@ addExtraCompiler(xpathbison)
  53.  
  54. # GENERATOR 11: WebKit Version
  55. # The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in Source/WebKit/mac/Configurations/.
  56. -webkitversion.wkScript = $$PWD/../../Source/WebKit/scripts/generate-webkitversion.pl
  57. +webkitversion.wkScript = $$PWD/../WebKit/scripts/generate-webkitversion.pl
  58. webkitversion.output = $${WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
  59. webkitversion.input = webkitversion.wkScript
  60. -webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../../Source/WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
  61. +webkitversion.commands = perl $$webkitversion.wkScript --config $$PWD/../WebKit/mac/Configurations/Version.xcconfig --outputDir $${WC_GENERATED_SOURCES_DIR}/
  62. webkitversion.clean = ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/WebKitVersion.h
  63. webkitversion.wkAddOutputToSources = false
  64. addExtraCompiler(webkitversion)
  65. diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
  66. index a857242..be1718e 100644
  67. --- a/Source/WebCore/WebCore.pro
  68. +++ b/Source/WebCore/WebCore.pro
  69. @@ -52,12 +52,12 @@ symbian: {
  70. " "
  71. webkitlibs.pkg_prerules = vendorinfo
  72.  
  73. - webkitbackup.sources = ../../Source/WebKit/qt/symbian/backup_registration.xml
  74. + webkitbackup.sources = ../WebKit/qt/symbian/backup_registration.xml
  75. webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
  76.  
  77. contains(QT_CONFIG, declarative) {
  78. declarativeImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll
  79. - declarativeImport.sources += ../../Source/WebKit/qt/declarative/qmldir
  80. + declarativeImport.sources += ../WebKit/qt/declarative/qmldir
  81. declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit
  82. DEPLOYMENT += declarativeImport
  83. }
  84. @@ -90,7 +90,7 @@ CONFIG(standalone_package) {
  85. isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
  86. isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = $$PWD/../JavaScriptCore/generated
  87.  
  88. - PRECOMPILED_HEADER = $$PWD/../../Source/WebKit/qt/WebKit_pch.h
  89. + PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
  90. } else {
  91. isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
  92. isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
  93. @@ -110,7 +110,7 @@ CONFIG(QTDIR_build) {
  94. !static: DEFINES += QT_MAKEDLL
  95. symbian: TARGET =$$TARGET$${QT_LIBINFIX}
  96. }
  97. -moduleFile=$$PWD/../../Source/WebKit/qt/qt_webkit_version.pri
  98. +moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri
  99. isEmpty(QT_BUILD_TREE):include($$moduleFile)
  100. VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
  101.  
  102. @@ -181,8 +181,8 @@ include($$PWD/../JavaScriptCore/JavaScriptCore.pri)
  103. !v8: addJavaScriptCoreLib(../JavaScriptCore)
  104.  
  105. webkit2 {
  106. - include($$PWD/../../Source/WebKit2/WebKit2.pri)
  107. - addWebKit2LibWholeArchive(../../Source/WebKit2)
  108. + include($$PWD/../WebKit2/WebKit2.pri)
  109. + addWebKit2LibWholeArchive(../WebKit2)
  110. }
  111.  
  112. # Extract sources to build from the generator definitions
  113. @@ -285,8 +285,8 @@ WEBCORE_INCLUDEPATH = \
  114. $$PWD/platform/graphics/qt \
  115. $$PWD/platform/network/qt \
  116. $$PWD/platform/qt \
  117. - $$PWD/../../Source/WebKit/qt/Api \
  118. - $$PWD/../../Source/WebKit/qt/WebCoreSupport \
  119. + $$PWD/../WebKit/qt/Api \
  120. + $$PWD/../WebKit/qt/WebCoreSupport \
  121. $$WEBCORE_INCLUDEPATH
  122.  
  123. symbian {
  124. @@ -2658,18 +2658,18 @@ HEADERS += \
  125. xml/XSLTExtensions.h \
  126. xml/XSLTProcessor.h \
  127. xml/XSLTUnicodeSort.h \
  128. - $$PWD/../../Source/WebKit/qt/Api/qwebplugindatabase_p.h \
  129. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/InspectorServerQt.h \
  130. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
  131. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
  132. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
  133. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
  134. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
  135. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/PageClientQt.h \
  136. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
  137. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h \
  138. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
  139. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
  140. + $$PWD/../WebKit/qt/Api/qwebplugindatabase_p.h \
  141. + $$PWD/../WebKit/qt/WebCoreSupport/InspectorServerQt.h \
  142. + $$PWD/../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h \
  143. + $$PWD/../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h \
  144. + $$PWD/../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.h \
  145. + $$PWD/../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.h \
  146. + $$PWD/../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h \
  147. + $$PWD/../WebKit/qt/WebCoreSupport/PageClientQt.h \
  148. + $$PWD/../WebKit/qt/WebCoreSupport/QtPlatformPlugin.h \
  149. + $$PWD/../WebKit/qt/WebCoreSupport/PopupMenuQt.h \
  150. + $$PWD/../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.h \
  151. + $$PWD/../WebKit/qt/WebCoreSupport/WebPlatformStrategies.h \
  152. $$PWD/platform/network/qt/DnsPrefetchHelper.h
  153.  
  154. v8 {
  155. @@ -2757,39 +2757,39 @@ SOURCES += \
  156. platform/text/qt/TextCodecQt.cpp \
  157. platform/qt/WheelEventQt.cpp \
  158. platform/qt/WidgetQt.cpp \
  159. - ../../Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
  160. - ../../Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
  161. - ../../Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
  162. - ../../Source/WebKit/qt/WebCoreSupport/DragClientQt.cpp \
  163. - ../../Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
  164. - ../../Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
  165. - ../../Source/WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
  166. - ../../Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
  167. - ../../Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
  168. - ../../Source/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
  169. - ../../Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
  170. - ../../Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
  171. - ../../Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
  172. - ../../Source/WebKit/qt/WebCoreSupport/PageClientQt.cpp \
  173. - ../../Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
  174. - ../../Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
  175. - ../../Source/WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
  176. - ../../Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
  177. - ../../Source/WebKit/qt/Api/qwebframe.cpp \
  178. - ../../Source/WebKit/qt/Api/qgraphicswebview.cpp \
  179. - ../../Source/WebKit/qt/Api/qwebpage.cpp \
  180. - ../../Source/WebKit/qt/Api/qwebview.cpp \
  181. - ../../Source/WebKit/qt/Api/qwebelement.cpp \
  182. - ../../Source/WebKit/qt/Api/qwebhistory.cpp \
  183. - ../../Source/WebKit/qt/Api/qwebsettings.cpp \
  184. - ../../Source/WebKit/qt/Api/qwebhistoryinterface.cpp \
  185. - ../../Source/WebKit/qt/Api/qwebplugindatabase.cpp \
  186. - ../../Source/WebKit/qt/Api/qwebpluginfactory.cpp \
  187. - ../../Source/WebKit/qt/Api/qwebsecurityorigin.cpp \
  188. - ../../Source/WebKit/qt/Api/qwebscriptworld.cpp \
  189. - ../../Source/WebKit/qt/Api/qwebdatabase.cpp \
  190. - ../../Source/WebKit/qt/Api/qwebinspector.cpp \
  191. - ../../Source/WebKit/qt/Api/qwebkitversion.cpp
  192. + ../WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp \
  193. + ../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp \
  194. + ../WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp \
  195. + ../WebKit/qt/WebCoreSupport/DragClientQt.cpp \
  196. + ../WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp \
  197. + ../WebKit/qt/WebCoreSupport/EditorClientQt.cpp \
  198. + ../WebKit/qt/WebCoreSupport/EditCommandQt.cpp \
  199. + ../WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp \
  200. + ../WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp \
  201. + ../WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp \
  202. + ../WebKit/qt/WebCoreSupport/InspectorClientQt.cpp \
  203. + ../WebKit/qt/WebCoreSupport/InspectorServerQt.cpp \
  204. + ../WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp \
  205. + ../WebKit/qt/WebCoreSupport/PageClientQt.cpp \
  206. + ../WebKit/qt/WebCoreSupport/PopupMenuQt.cpp \
  207. + ../WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp \
  208. + ../WebKit/qt/WebCoreSupport/SearchPopupMenuQt.cpp \
  209. + ../WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp \
  210. + ../WebKit/qt/Api/qwebframe.cpp \
  211. + ../WebKit/qt/Api/qgraphicswebview.cpp \
  212. + ../WebKit/qt/Api/qwebpage.cpp \
  213. + ../WebKit/qt/Api/qwebview.cpp \
  214. + ../WebKit/qt/Api/qwebelement.cpp \
  215. + ../WebKit/qt/Api/qwebhistory.cpp \
  216. + ../WebKit/qt/Api/qwebsettings.cpp \
  217. + ../WebKit/qt/Api/qwebhistoryinterface.cpp \
  218. + ../WebKit/qt/Api/qwebplugindatabase.cpp \
  219. + ../WebKit/qt/Api/qwebpluginfactory.cpp \
  220. + ../WebKit/qt/Api/qwebsecurityorigin.cpp \
  221. + ../WebKit/qt/Api/qwebscriptworld.cpp \
  222. + ../WebKit/qt/Api/qwebdatabase.cpp \
  223. + ../WebKit/qt/Api/qwebinspector.cpp \
  224. + ../WebKit/qt/Api/qwebkitversion.cpp
  225.  
  226. contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
  227. HEADERS += platform/qt/QtMobileWebStyle.h
  228. @@ -2797,8 +2797,8 @@ contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
  229. }
  230.  
  231. maemo5 {
  232. - HEADERS += ../../Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
  233. - SOURCES += ../../Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
  234. + HEADERS += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h
  235. + SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp
  236. }
  237.  
  238. contains(DEFINES, ENABLE_SMOOTH_SCROLLING=1) {
  239. @@ -3262,11 +3262,11 @@ contains(DEFINES, ENABLE_VIDEO=1) {
  240. } else:contains(MOBILITY_CONFIG, multimedia) {
  241. HEADERS += \
  242. platform/graphics/qt/MediaPlayerPrivateQt.h \
  243. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
  244. + $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
  245.  
  246. SOURCES += \
  247. platform/graphics/qt/MediaPlayerPrivateQt.cpp \
  248. - $$PWD/../../Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
  249. + $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
  250.  
  251. CONFIG *= mobility
  252. MOBILITY += multimedia
  253. @@ -3452,18 +3452,18 @@ contains(DEFINES, ENABLE_GEOLOCATION=1) {
  254.  
  255. contains(DEFINES, ENABLE_DEVICE_ORIENTATION=1) {
  256. HEADERS += \
  257. - ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
  258. - ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
  259. - ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
  260. - ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
  261. - ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
  262. + ../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.h \
  263. + ../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.h \
  264. + ../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.h \
  265. + ../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.h \
  266. + ../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h
  267.  
  268. SOURCES += \
  269. - ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
  270. - ../../Source/WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
  271. - ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
  272. - ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
  273. - ../../Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
  274. + ../WebKit/qt/WebCoreSupport/DeviceMotionClientQt.cpp \
  275. + ../WebKit/qt/WebCoreSupport/DeviceMotionProviderQt.cpp \
  276. + ../WebKit/qt/WebCoreSupport/DeviceOrientationClientQt.cpp \
  277. + ../WebKit/qt/WebCoreSupport/DeviceOrientationClientMockQt.cpp \
  278. + ../WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp
  279.  
  280. CONFIG += mobility
  281. MOBILITY += sensors
  282. @@ -3868,7 +3868,7 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) {
  283. QMAKE_EXTRA_TARGETS += install
  284. }
  285.  
  286. -include($$PWD/../../Source/WebKit/qt/Api/headers.pri)
  287. +include($$PWD/../WebKit/qt/Api/headers.pri)
  288.  
  289. HEADERS += $$WEBKIT_API_HEADERS
  290.  
  291. @@ -3996,9 +3996,9 @@ contains(CONFIG, texmap) {
  292. symbian {
  293. shared {
  294. contains(CONFIG, def_files) {
  295. - DEF_FILE=../../Source/WebKit/qt/symbian
  296. + DEF_FILE=../WebKit/qt/symbian
  297. # defFilePath is for Qt4.6 compatibility
  298. - defFilePath=../../Source/WebKit/qt/symbian
  299. + defFilePath=../WebKit/qt/symbian
  300. } else {
  301. MMP_RULES += EXPORTUNFROZEN
  302. }
  303. diff --git a/Source/WebKit/qt/Api/DerivedSources.pro b/Source/WebKit/qt/Api/DerivedSources.pro
  304. index 3109ffe..8084242 100644
  305. --- a/Source/WebKit/qt/Api/DerivedSources.pro
  306. +++ b/Source/WebKit/qt/Api/DerivedSources.pro
  307. @@ -45,7 +45,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
  308. # the package sources are relocatable.
  309.  
  310. PATH_TO_HEADER = $$HEADER
  311. - CONFIG(standalone_package): PATH_TO_HEADER = ../../../Source/WebKit/qt/Api/$$basename(HEADER)
  312. + CONFIG(standalone_package): PATH_TO_HEADER = ../../WebKit/qt/Api/$$basename(HEADER)
  313.  
  314. eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
  315. eval($${HEADER_TARGET}.depends = $$HEADER)
  316. diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
  317. index f760119..443f3ea 100644
  318. --- a/Source/WebKit/qt/ChangeLog
  319. +++ b/Source/WebKit/qt/ChangeLog
  320. @@ -1,3 +1,12 @@
  321. +2011-01-19 Csaba Osztrogonác <ossy@webkit.org>
  322. +
  323. + Reviewed by NOBODY (OOPS!).
  324. +
  325. + [Qt] Remove unnecessary "../Source" from paths
  326. + after moving source files into Source is finished.
  327. +
  328. + * Api/DerivedSources.pro:
  329. +
  330. 2011-01-18 Robert Hogan <robert@webkit.org>
  331.  
  332. Reviewed by Simon Hausmann.
  333. diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
  334. index 72d950e..6354246 100644
  335. --- a/Source/WebKit2/ChangeLog
  336. +++ b/Source/WebKit2/ChangeLog
  337. @@ -1,3 +1,13 @@
  338. +2011-01-19 Csaba Osztrogonác <ossy@webkit.org>
  339. +
  340. + Reviewed by NOBODY (OOPS!).
  341. +
  342. + [Qt] Remove unnecessary "../Source" from paths
  343. + after moving source files into Source is finished.
  344. +
  345. + * DerivedSources.pro:
  346. + * WebKit2.pro:
  347. +
  348. 2011-01-18 Maciej Stachowiak <mjs@apple.com>
  349.  
  350. Reviewed by Sam Weinig.
  351. diff --git a/Source/WebKit2/DerivedSources.pro b/Source/WebKit2/DerivedSources.pro
  352. index 4f6c7d9..4164203 100644
  353. --- a/Source/WebKit2/DerivedSources.pro
  354. +++ b/Source/WebKit2/DerivedSources.pro
  355. @@ -5,10 +5,10 @@ CONFIG -= debug_and_release
  356.  
  357. CONFIG(standalone_package) {
  358. isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
  359. - isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../Source/WebCore/generated
  360. + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
  361. } else {
  362. isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
  363. - isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../Source/WebCore/generated
  364. + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
  365. }
  366.  
  367. WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \
  368. diff --git a/Source/WebKit2/WebKit2.pro b/Source/WebKit2/WebKit2.pro
  369. index f4e007b..c478636 100644
  370. --- a/Source/WebKit2/WebKit2.pro
  371. +++ b/Source/WebKit2/WebKit2.pro
  372. @@ -7,15 +7,15 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
  373.  
  374. CONFIG(standalone_package) {
  375. isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
  376. - isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../../Source/WebCore/generated
  377. + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
  378. } else {
  379. isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
  380. - isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../../Source/WebCore/generated
  381. + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
  382. }
  383.  
  384. include($$PWD/../../WebKit.pri)
  385. include($$PWD/../../common.pri)
  386. -include($$PWD/../../Source/WebCore/features.pri)
  387. +include($$PWD/../WebCore/features.pri)
  388. include(WebKit2.pri)
  389.  
  390. TEMPLATE = lib
  391. @@ -34,89 +34,88 @@ DESTDIR = $$WEBKIT2_DESTDIR
  392. mac: CONFIG += build_all
  393.  
  394. WEBKIT2_INCLUDEPATH = \
  395. - $$PWD/../.. \ # FIXME: Remove this include once we move all the source to Source.
  396. - $$PWD/../../Source \
  397. + $$PWD/.. \
  398.  
  399. WEBKIT2_INCLUDEPATH = \
  400. - $$PWD/../../Source/JavaScriptCore \
  401. - $$PWD/../../Source/JavaScriptCore/assembler \
  402. - $$PWD/../../Source/JavaScriptCore/bytecode \
  403. - $$PWD/../../Source/JavaScriptCore/bytecompiler \
  404. - $$PWD/../../Source/JavaScriptCore/debugger \
  405. - $$PWD/../../Source/JavaScriptCore/interpreter \
  406. - $$PWD/../../Source/JavaScriptCore/jit \
  407. - $$PWD/../../Source/JavaScriptCore/parser \
  408. - $$PWD/../../Source/JavaScriptCore/pcre \
  409. - $$PWD/../../Source/JavaScriptCore/profiler \
  410. - $$PWD/../../Source/JavaScriptCore/runtime \
  411. - $$PWD/../../Source/JavaScriptCore/wtf \
  412. - $$PWD/../../Source/JavaScriptCore/wtf/symbian \
  413. - $$PWD/../../Source/JavaScriptCore/wtf/unicode \
  414. - $$PWD/../../Source/JavaScriptCore/yarr \
  415. - $$PWD/../../Source/JavaScriptCore/API \
  416. - $$PWD/../../Source/JavaScriptCore/ForwardingHeaders \
  417. + $$PWD/../JavaScriptCore \
  418. + $$PWD/../JavaScriptCore/assembler \
  419. + $$PWD/../JavaScriptCore/bytecode \
  420. + $$PWD/../JavaScriptCore/bytecompiler \
  421. + $$PWD/../JavaScriptCore/debugger \
  422. + $$PWD/../JavaScriptCore/interpreter \
  423. + $$PWD/../JavaScriptCore/jit \
  424. + $$PWD/../JavaScriptCore/parser \
  425. + $$PWD/../JavaScriptCore/pcre \
  426. + $$PWD/../JavaScriptCore/profiler \
  427. + $$PWD/../JavaScriptCore/runtime \
  428. + $$PWD/../JavaScriptCore/wtf \
  429. + $$PWD/../JavaScriptCore/wtf/symbian \
  430. + $$PWD/../JavaScriptCore/wtf/unicode \
  431. + $$PWD/../JavaScriptCore/yarr \
  432. + $$PWD/../JavaScriptCore/API \
  433. + $$PWD/../JavaScriptCore/ForwardingHeaders \
  434. $$WEBKIT2_INCLUDEPATH
  435.  
  436. WEBKIT2_INCLUDEPATH = \
  437. - $$PWD/../../Source/WebCore \
  438. - $$PWD/../../Source/WebCore/accessibility \
  439. - $$PWD/../../Source/WebCore/bindings \
  440. - $$PWD/../../Source/WebCore/bindings/generic \
  441. - $$PWD/../../Source/WebCore/bindings/js \
  442. - $$PWD/../../Source/WebCore/bridge \
  443. - $$PWD/../../Source/WebCore/bridge/c \
  444. - $$PWD/../../Source/WebCore/bridge/jsc \
  445. - $$PWD/../../Source/WebCore/css \
  446. - $$PWD/../../Source/WebCore/dom \
  447. - $$PWD/../../Source/WebCore/dom/default \
  448. - $$PWD/../../Source/WebCore/editing \
  449. - $$PWD/../../Source/WebCore/history \
  450. - $$PWD/../../Source/WebCore/html \
  451. - $$PWD/../../Source/WebCore/html/canvas \
  452. - $$PWD/../../Source/WebCore/inspector \
  453. - $$PWD/../../Source/WebCore/loader \
  454. - $$PWD/../../Source/WebCore/loader/appcache \
  455. - $$PWD/../../Source/WebCore/loader/archive \
  456. - $$PWD/../../Source/WebCore/loader/cache \
  457. - $$PWD/../../Source/WebCore/loader/icon \
  458. - $$PWD/../../Source/WebCore/mathml \
  459. - $$PWD/../../Source/WebCore/notifications \
  460. - $$PWD/../../Source/WebCore/page \
  461. - $$PWD/../../Source/WebCore/page/animation \
  462. - $$PWD/../../Source/WebCore/platform \
  463. - $$PWD/../../Source/WebCore/platform/animation \
  464. - $$PWD/../../Source/WebCore/platform/graphics \
  465. - $$PWD/../../Source/WebCore/platform/graphics/filters \
  466. - $$PWD/../../Source/WebCore/platform/graphics/transforms \
  467. - $$PWD/../../Source/WebCore/platform/image-decoders \
  468. - $$PWD/../../Source/WebCore/platform/mock \
  469. - $$PWD/../../Source/WebCore/platform/network \
  470. - $$PWD/../../Source/WebCore/platform/sql \
  471. - $$PWD/../../Source/WebCore/platform/text \
  472. - $$PWD/../../Source/WebCore/platform/text/transcoder \
  473. - $$PWD/../../Source/WebCore/plugins \
  474. - $$PWD/../../Source/WebCore/rendering \
  475. - $$PWD/../../Source/WebCore/rendering/style \
  476. - $$PWD/../../Source/WebCore/storage \
  477. - $$PWD/../../Source/WebCore/svg \
  478. - $$PWD/../../Source/WebCore/svg/animation \
  479. - $$PWD/../../Source/WebCore/svg/graphics \
  480. - $$PWD/../../Source/WebCore/svg/graphics/filters \
  481. - $$PWD/../../Source/WebCore/svg/properties \
  482. - $$PWD/../../Source/WebCore/websockets \
  483. - $$PWD/../../Source/WebCore/wml \
  484. - $$PWD/../../Source/WebCore/workers \
  485. - $$PWD/../../Source/WebCore/xml \
  486. + $$PWD/../WebCore \
  487. + $$PWD/../WebCore/accessibility \
  488. + $$PWD/../WebCore/bindings \
  489. + $$PWD/../WebCore/bindings/generic \
  490. + $$PWD/../WebCore/bindings/js \
  491. + $$PWD/../WebCore/bridge \
  492. + $$PWD/../WebCore/bridge/c \
  493. + $$PWD/../WebCore/bridge/jsc \
  494. + $$PWD/../WebCore/css \
  495. + $$PWD/../WebCore/dom \
  496. + $$PWD/../WebCore/dom/default \
  497. + $$PWD/../WebCore/editing \
  498. + $$PWD/../WebCore/history \
  499. + $$PWD/../WebCore/html \
  500. + $$PWD/../WebCore/html/canvas \
  501. + $$PWD/../WebCore/inspector \
  502. + $$PWD/../WebCore/loader \
  503. + $$PWD/../WebCore/loader/appcache \
  504. + $$PWD/../WebCore/loader/archive \
  505. + $$PWD/../WebCore/loader/cache \
  506. + $$PWD/../WebCore/loader/icon \
  507. + $$PWD/../WebCore/mathml \
  508. + $$PWD/../WebCore/notifications \
  509. + $$PWD/../WebCore/page \
  510. + $$PWD/../WebCore/page/animation \
  511. + $$PWD/../WebCore/platform \
  512. + $$PWD/../WebCore/platform/animation \
  513. + $$PWD/../WebCore/platform/graphics \
  514. + $$PWD/../WebCore/platform/graphics/filters \
  515. + $$PWD/../WebCore/platform/graphics/transforms \
  516. + $$PWD/../WebCore/platform/image-decoders \
  517. + $$PWD/../WebCore/platform/mock \
  518. + $$PWD/../WebCore/platform/network \
  519. + $$PWD/../WebCore/platform/sql \
  520. + $$PWD/../WebCore/platform/text \
  521. + $$PWD/../WebCore/platform/text/transcoder \
  522. + $$PWD/../WebCore/plugins \
  523. + $$PWD/../WebCore/rendering \
  524. + $$PWD/../WebCore/rendering/style \
  525. + $$PWD/../WebCore/storage \
  526. + $$PWD/../WebCore/svg \
  527. + $$PWD/../WebCore/svg/animation \
  528. + $$PWD/../WebCore/svg/graphics \
  529. + $$PWD/../WebCore/svg/graphics/filters \
  530. + $$PWD/../WebCore/svg/properties \
  531. + $$PWD/../WebCore/websockets \
  532. + $$PWD/../WebCore/wml \
  533. + $$PWD/../WebCore/workers \
  534. + $$PWD/../WebCore/xml \
  535. $$WEBKIT2_INCLUDEPATH
  536.  
  537. WEBKIT2_INCLUDEPATH = \
  538. - $$PWD/../../Source/WebCore/bridge/qt \
  539. - $$PWD/../../Source/WebCore/page/qt \
  540. - $$PWD/../../Source/WebCore/platform/graphics/qt \
  541. - $$PWD/../../Source/WebCore/platform/network/qt \
  542. - $$PWD/../../Source/WebCore/platform/qt \
  543. - $$PWD/../../WebKit/qt/Api \
  544. - $$PWD/../../WebKit/qt/WebCoreSupport \
  545. + $$PWD/../WebCore/bridge/qt \
  546. + $$PWD/../WebCore/page/qt \
  547. + $$PWD/../WebCore/platform/graphics/qt \
  548. + $$PWD/../WebCore/platform/network/qt \
  549. + $$PWD/../WebCore/platform/qt \
  550. + $$PWD/../WebKit/qt/Api \
  551. + $$PWD/../WebKit/qt/WebCoreSupport \
  552. $$WEBKIT2_INCLUDEPATH
  553.  
  554. WEBKIT2_INCLUDEPATH = \
  555. @@ -171,7 +170,7 @@ symbian {
  556. INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$INCLUDEPATH
  557. }
  558.  
  559. -PREFIX_HEADER = $$PWD/../../Source/WebKit2/WebKit2Prefix.h
  560. +PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
  561. *-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
  562.  
  563. WEBKIT2_GENERATED_HEADERS = \
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!