26779 2009-06-27 20:26:12 -0700 [Qt] Fix build break for Qt 2009-06-28 05:41:00 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P1 Normal --- 1 sriram.yadavalli webkit-unassigned oldest_to_newest 128701 0 sriram.yadavalli 2009-06-27 20:26:12 -0700 Build break introduced due to changes in http://trac.webkit.org/changeset/45304 and in http://trac.webkit.org/changeset/45290 128702 1 jmalonzo 2009-06-27 20:32:55 -0700 (In reply to comment #0) > Build break introduced due to changes in http://trac.webkit.org/changeset/45304 > and in http://trac.webkit.org/changeset/45290 > Bug #26769 already fixes the build break caused by r45290. 128703 2 31986 sriram.yadavalli 2009-06-27 20:38:18 -0700 Created attachment 31986 Patch for Qt build break 128704 3 31986 jmalonzo 2009-06-27 20:43:39 -0700 Comment on attachment 31986 Patch for Qt build break > Index: ../../WebCore/WebCore.pro > =================================================================== > --- ../../WebCore/WebCore.pro (revision 45314) > +++ ../../WebCore/WebCore.pro (working copy) > @@ -1366,20 +1366,19 @@ > HEADERS += \ > storage/Storage.h \ > storage/StorageEvent.h \ > - storage/SessionStorage.h \ > storage/StorageSyncManager.h \ > + storage/StorageNameSpace.h \ > storage/StorageAreaSync.h > > SOURCES += \ > - storage/LocalStorage.cpp \ > storage/LocalStorageTask.cpp \ > storage/LocalStorageThread.cpp \ > storage/Storage.cpp \ > + storage/StorageNameSpace.cpp \ > storage/StorageArea.cpp \ > storage/StorageAreaSync.cpp \ > storage/StorageMap.cpp \ > storage/StorageEvent.cpp \ > - storage/SessionStorage.cpp \ > storage/StorageSyncManager.cpp \ > bindings/js/JSStorageCustom.cpp Please don't include this. See comment #1. 128728 4 31986 eric 2009-06-28 02:49:09 -0700 Comment on attachment 31986 Patch for Qt build break I think part of this may already be in. Looks fine. 128736 5 jmalonzo 2009-06-28 05:41:00 -0700 (In reply to comment #4) > (From update of attachment 31986 [review]) > I think part of this may already be in. Looks fine. > Landed in r45329 31986 2009-06-27 20:38:18 -0700 2009-06-28 02:49:09 -0700 Patch for Qt build break QtBuildFix.patch text/plain 2646 sriram.yadavalli SW5kZXg6IC4uLy4uL1dlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gLi4vLi4vV2Vi Q29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24gNDUzMTQpCisrKyAuLi8uLi9XZWJDb3JlL1dlYkNv cmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0xMzY2LDIwICsxMzY2LDE5IEBACiAgICAgSEVBREVS UyArPSBcCiAgICAgICAgIHN0b3JhZ2UvU3RvcmFnZS5oIFwKICAgICAgICAgc3RvcmFnZS9TdG9y YWdlRXZlbnQuaCBcCi0gICAgICAgIHN0b3JhZ2UvU2Vzc2lvblN0b3JhZ2UuaCBcCiAgICAgICAg IHN0b3JhZ2UvU3RvcmFnZVN5bmNNYW5hZ2VyLmggXAorICAgICAgICBzdG9yYWdlL1N0b3JhZ2VO YW1lU3BhY2UuaCBcCiAgICAgICAgIHN0b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmgKIAogICAgIFNP VVJDRVMgKz0gXAotICAgICAgICBzdG9yYWdlL0xvY2FsU3RvcmFnZS5jcHAgXAogICAgICAgICBz dG9yYWdlL0xvY2FsU3RvcmFnZVRhc2suY3BwIFwKICAgICAgICAgc3RvcmFnZS9Mb2NhbFN0b3Jh Z2VUaHJlYWQuY3BwIFwKICAgICAgICAgc3RvcmFnZS9TdG9yYWdlLmNwcCBcCisgICAgICAgIHN0 b3JhZ2UvU3RvcmFnZU5hbWVTcGFjZS5jcHAgXAogICAgICAgICBzdG9yYWdlL1N0b3JhZ2VBcmVh LmNwcCBcCiAgICAgICAgIHN0b3JhZ2UvU3RvcmFnZUFyZWFTeW5jLmNwcCBcCiAgICAgICAgIHN0 b3JhZ2UvU3RvcmFnZU1hcC5jcHAgXAogICAgICAgICBzdG9yYWdlL1N0b3JhZ2VFdmVudC5jcHAg XAotICAgICAgICBzdG9yYWdlL1Nlc3Npb25TdG9yYWdlLmNwcCBcCiAgICAgICAgIHN0b3JhZ2Uv U3RvcmFnZVN5bmNNYW5hZ2VyLmNwcCBcCiAgICAgICAgIGJpbmRpbmdzL2pzL0pTU3RvcmFnZUN1 c3RvbS5jcHAKIApJbmRleDogLi4vLi4vV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSAuLi8uLi9XZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lvbiA0NTMxNSkKKysrIC4uLy4uL1dl YktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0w Ni0yNyAgU3JpcmFtIFlhZGF2YWxsaSAgPHNyaXJhbS55YWRhdmFsbGlAbm9raWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2Nzc5CisKKyAgICAgICAgKiBBcGkvcXdlYnBh Z2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnN3YWxsb3dDb250ZXh0TWVudUV2ZW50KToKKwog MjAwOS0wNi0yNyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAK ICAgICAgICAgQnVpbGQgZml4IGZvciBRdCB1bmRlciBXaW5kb3dzLgpJbmRleDogLi4vLi4vV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gLi4vLi4vV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDQ1MzE0KQorKysgLi4vLi4vV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxOTUsNyArMjE5NSw3IEBACiAKICAgICBp ZiAoUVdlYkZyYW1lKiB3ZWJGcmFtZSA9IGQtPmZyYW1lQXQoZXZlbnQtPnBvcygpKSkgewogICAg ICAgICBGcmFtZSogZnJhbWUgPSBRV2ViRnJhbWVQcml2YXRlOjpjb3JlKHdlYkZyYW1lKTsKLSAg ICAgICAgaWYgKFNjcm9sbGJhciogc2Nyb2xsYmFyID0gZnJhbWUtPnZpZXcoKS0+c2Nyb2xsYmFy VW5kZXJNb3VzZShQbGF0Zm9ybU1vdXNlRXZlbnQoZXZlbnQsIDEpLnBvcygpKSkgeworICAgICAg ICBpZiAoU2Nyb2xsYmFyKiBzY3JvbGxiYXIgPSBmcmFtZS0+dmlldygpLT5zY3JvbGxiYXJVbmRl clBvaW50KFBsYXRmb3JtTW91c2VFdmVudChldmVudCwgMSkucG9zKCkpKSB7CiAgICAgICAgICAg ICByZXR1cm4gc2Nyb2xsYmFyLT5jb250ZXh0TWVudShQbGF0Zm9ybU1vdXNlRXZlbnQoZXZlbnQs IDEpKTsKICAgICAgICAgfQogICAgIH0KSW5kZXg6IC4uLy4uL1dlYkNvcmUvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIC4uLy4uL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA0NTMxNSkKKysr IC4uLy4uL1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAK KzIwMDktMDYtMjcgIFNyaXJhbSBZYWRhdmFsbGkgIDxzcmlyYW0ueWFkYXZhbGxpQG5va2lhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubgorCisgICAgICAgIEZpeCBi dWlsZCBicmVhayBmb3IgUXQKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjY3NzkKKworICAgICAgICAqIFdlYkNvcmUucHJvOgorCiAyMDA5LTA2LTI3 ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4K