27368 2009-07-17 05:47:14 -0700 [Qt] On Symbian link against the system sqlite3 2009-07-20 02:45:11 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 27065 0 laszlo.gombos webkit-unassigned hausmann norbert.leser yongjun.zhang oldest_to_newest 132551 0 laszlo.gombos 2009-07-17 05:47:14 -0700 QtWebKit allows linking against sqlite3 from the OS or pick up the sqlite sources and link in sqlite3 statically into QtWebKit library. On Symbian the syntax for linking against the OS sqlite3 is a slightly different than on other OS's. 132555 1 32935 laszlo.gombos 2009-07-17 05:59:02 -0700 Created attachment 32935 First try. Add an option for all Qt builds to force linking against system sqlite3 by adding system-sqlite to the CONFIG variable - up until now this was only an option for QTDIR_build builds. The symbian specific part of this patch is contributed by Norbert Leser. 132805 2 32935 zecke 2009-07-17 18:08:05 -0700 Comment on attachment 32935 First try. > + INCLUDEPATH += $${SQLITE3SRCDIR} > + symbian: LIBS += -lsqlite3.lib > + else: LIBS += -lsqlite3 Looks good, it might look like the else is not properly indented... please check that when landing. 133091 3 hausmann 2009-07-20 02:45:11 -0700 Landed in 46112. qmake's syntax is funny at times, the else was correct :) 32935 2009-07-17 05:59:02 -0700 2009-07-17 18:08:05 -0700 First try. patch_27368.txt text/plain 2917 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjAyOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDctMTcgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gT24gU3ltYmlhbiBsaW5rIGFnYWluc3Qgc3lzdGVtIHNxbGl0ZTMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3MzY4CisKKyAgICAg ICAgQWRkIGFuIG9wdGlvbiB0byBmb3JjZSBsaW5raW5nIGFnYWluc3Qgc3lzdGVtIHNxbGl0ZTMK KyAgICAgICAgYnkgYWRkaW5nIHN5c3RlbS1zcWxpdGUgdG8gdGhlIENPTkZJRyB2YXJpYWJsZS4K KworICAgICAgICBUaGUgU3ltYmlhbiBzcGVjaWZpYyBwYXJ0IG9mIHRoaXMgcGF0Y2ggaXMgY29u dHJpYnV0ZWQgYnkgCisgICAgICAgIE5vcmJlcnQgTGVzZXIuCisKKyAgICAgICAgKiBXZWJDb3Jl LnBybzoKKwogMjAwOS0wNy0xNyAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bu b2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCkluZGV4OiBX ZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHJl dmlzaW9uIDQ1OTgwKQorKysgV2ViQ29yZS9XZWJDb3JlLnBybwkod29ya2luZyBjb3B5KQpAQCAt ODAsNiArODAsOSBAQCB3aW4zMi1nKysgewogICAgIFFNQUtFX0xJQkRJUl9QT1NUICs9ICQkc3Bs aXQoVE1QUEFUSCwiOyIpCiB9CiAKKyMgQXNzdW1lIHRoYXQgc3ltYmlhbiBPUyBhbHdheXMgY29t ZXMgd2l0aCBzcWxpdGUKK3N5bWJpYW46IUNPTkZJRyhRVERJUl9idWlsZCk6IENPTkZJRyArPSBz eXN0ZW0tc3FsaXRlCisKICMgVHJ5IHRvIGxvY2F0ZSBzcWxpdGUzIHNvdXJjZQogQ09ORklHKFFU RElSX2J1aWxkKSB7CiAgICAgU1FMSVRFM1NSQ0RJUiA9ICQkUVRfU09VUkNFX1RSRUUvc3JjLzNy ZHBhcnR5L3NxbGl0ZS8KQEAgLTEzMDMsMjQgKzEzMDYsMjMgQEAgY29udGFpbnMoREVGSU5FUywg RU5BQkxFX0RBU0hCT0FSRF9TVVBQTwogfQogCiBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1FM SVRFPTEpIHsKLSAgICAjIHNvbWV3aGF0IGNvcGllZCBmcm9tIHNyYy9wbHVnaW5zL3NxbGRyaXZl cnMvc3FsaXRlL3NxbGl0ZS5wcm8KLSAgICBDT05GSUcoUVRESVJfYnVpbGQpOnN5c3RlbS1zcWxp dGUgewotICAgICAgICBMSUJTICo9ICQkUVRfTEZMQUdTX1NRTElURQotICAgICAgICBRTUFLRV9D WFhGTEFHUyAqPSAkJFFUX0NGTEFHU19TUUxJVEUKLSAgICB9IGVsc2UgewotICAgICAgICBleGlz dHMoICQke1NRTElURTNTUkNESVJ9L3NxbGl0ZTMuYyApICB7Ci0gICAgICAgICAgICAjIHdlIGhh dmUgc291cmNlIC0gdXNlIGl0Ci0gICAgICAgICAgICBDT05GSUcocmVsZWFzZSwgZGVidWd8cmVs ZWFzZSk6REVGSU5FUyAqPSBOREVCVUcKLSAgICAgICAgICAgIERFRklORVMgKz0gU1FMSVRFX0NP UkUgU1FMSVRFX09NSVRfTE9BRF9FWFRFTlNJT04gU1FMSVRFX09NSVRfQ09NUExFVEUgCi0gICAg ICAgICAgICBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU0lOR0xFX1RIUkVBREVEPTEpIHsKLSAg ICAgICAgICAgICAgICBERUZJTkVTKz1TUUxJVEVfVEhSRUFEU0FGRT0wCi0gICAgICAgICAgICB9 CisgICAgIXN5c3RlbS1zcWxpdGU6ZXhpc3RzKCAkJHtTUUxJVEUzU1JDRElSfS9zcWxpdGUzLmMg KSB7CisgICAgICAgICAgICAjIEJ1aWxkIHNxbGl0ZTMgaW50byBXZWJDb3JlIGZyb20gc291cmNl CisgICAgICAgICAgICAjIHNvbWV3aGF0IGNvcGllZCBmcm9tICQkUVRfU09VUkNFX1RSRUUvc3Jj L3BsdWdpbnMvc3FsZHJpdmVycy9zcWxpdGUvc3FsaXRlLnBybwogICAgICAgICAgICAgSU5DTFVE RVBBVEggKz0gJCR7U1FMSVRFM1NSQ0RJUn0KICAgICAgICAgICAgIFNPVVJDRVMgKz0gJCR7U1FM SVRFM1NSQ0RJUn0vc3FsaXRlMy5jCisgICAgICAgICAgICBERUZJTkVTICs9IFNRTElURV9DT1JF IFNRTElURV9PTUlUX0xPQURfRVhURU5TSU9OIFNRTElURV9PTUlUX0NPTVBMRVRFCisgICAgICAg ICAgICBDT05GSUcocmVsZWFzZSwgZGVidWd8cmVsZWFzZSk6IERFRklORVMgKj0gTkRFQlVHCisg ICAgICAgICAgICBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU0lOR0xFX1RIUkVBREVEPTEpOiBE RUZJTkVTICs9IFNRTElURV9USFJFQURTQUZFPTAKKyAgICB9IGVsc2UgeworICAgICAgICAjIFVz ZSBzcWxpdGUzIGZyb20gdGhlIHVuZGVybHlpbmcgT1MKKyAgICAgICAgQ09ORklHKFFURElSX2J1 aWxkKSB7CisgICAgICAgICAgICBRTUFLRV9DWFhGTEFHUyAqPSAkJFFUX0NGTEFHU19TUUxJVEUK KyAgICAgICAgICAgIExJQlMgKj0gJCRRVF9MRkxBR1NfU1FMSVRFCiAgICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICAjIGZhbGwgYmFjayB0byBwbGF0Zm9ybSBsaWJyYXJ5Ci0gICAgICAgICAg ICBJTkNMVURFUEFUSCArPSAkJFtRVF9JTlNUQUxMX1BSRUZJWF0vc3JjLzNyZHBhcnR5L3NxbGl0 ZS8KLSAgICAgICAgICAgIExJQlMgKz0gLWxzcWxpdGUzCisgICAgICAgICAgICBJTkNMVURFUEFU SCArPSAkJHtTUUxJVEUzU1JDRElSfQorICAgICAgICAgICAgc3ltYmlhbjogTElCUyArPSAtbHNx bGl0ZTMubGliCisgICAgICAgICAgICBlbHNlOiBMSUJTICs9IC1sc3FsaXRlMwogICAgICAgICB9 CiAgICAgfQogCg==