From 1652b1e10a3cc3e74bbc4c301f485f6fc3538bba Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 Jan 2013 23:26:01 +0100 Subject: [PATCH 01/42] Updated submodules. Change-Id: If565e02bdbdf8d2e3f08f45db96224c20074f168 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index b61d36ee..31d7f4b4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b61d36ee3668833ad51b98ffcafc962b5dd3fa9a +Subproject commit 31d7f4b4e631d08cbb7160027d849057abbd41f2 diff --git a/qtbase b/qtbase index 22c234a3..05659223 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 22c234a34e8af6a26b374ef810630ba9e82c696a +Subproject commit 05659223bf02c8bac0463fe1e7a9364ef5677b75 diff --git a/qtdeclarative b/qtdeclarative index ce97fe0f..7830710e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ce97fe0fc482f2fda72583544e3436508f73417e +Subproject commit 7830710e57cbbbc8a2fb37fc97eb99f552ecdd83 diff --git a/qtdoc b/qtdoc index 13e6a28c..f7cc32f0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 13e6a28c209e54a5546bea381b818bb4d6dee7a2 +Subproject commit f7cc32f086ca69dbaf93e6d1dd23a7a7fafb5bc1 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a49d49b4..f213905a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a49d49b4a95ef89be705b03c189697db7e0bfe45 +Subproject commit f213905ad6a755da57a8af904aa9c46ce9d7faca diff --git a/qtimageformats b/qtimageformats index d23bd9b0..c5b60caf 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d23bd9b09e00a3ae4eea2a24c8b727084db2e7f7 +Subproject commit c5b60caf11a22f179aea0b207e9480fc2fdebd4d diff --git a/qtjsbackend b/qtjsbackend index b41c2151..b2b83f01 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit b41c2151fdfca3f63a6cd45f6c69ae678694b63e +Subproject commit b2b83f01312e945237aa1aacadd4476133bf4038 diff --git a/qtmultimedia b/qtmultimedia index 0241b0e3..2a7b4962 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0241b0e39c4ac259c2336d074f1fa488d0e0ebcc +Subproject commit 2a7b4962a141939eb6efb63fc5834cb7a00141a6 diff --git a/qtqa b/qtqa index 3e37cc74..994d6a28 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3e37cc74538ab877ca604c1f2d73cd9e9ebef06d +Subproject commit 994d6a280c2c9555424676cc1c4c1fd82faa7935 diff --git a/qtquick1 b/qtquick1 index de8a87c0..aed7aa45 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit de8a87c011dabde51aac5ae1fc984f04e3db22ae +Subproject commit aed7aa451f582a772368b80506c7e26c3e8c18a2 diff --git a/qtrepotools b/qtrepotools index 92bcd67b..71131585 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 92bcd67be5494ea70e04265533394bdf3c838ac3 +Subproject commit 7113158570728898adc4ae92483c05002bcb80ad diff --git a/qtscript b/qtscript index 06129361..3efa6b0d 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 06129361aaf53e29125c0774865643f3f70c5456 +Subproject commit 3efa6b0da84d983f21370e4010ba44eb84e0070a diff --git a/qtsvg b/qtsvg index deaddacd..5c44a5e1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit deaddacd38f0a281b98db632e7cf1879403c9036 +Subproject commit 5c44a5e161794a96f63ab41037f97e6579bf5586 diff --git a/qttools b/qttools index 681b3f05..7cc1af65 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 681b3f05db103c7a6ddc216ad10707b56cca7a39 +Subproject commit 7cc1af6542c960c17ccfef02de943a35edcbb5df diff --git a/qttranslations b/qttranslations index 3a279e85..e225d71c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3a279e855d99c569e0d8c2434f4f99f50cbc689e +Subproject commit e225d71c9e1e02ca6cc91eb9e6f0322e185c98bf diff --git a/qtwebkit b/qtwebkit index bc50f900..061addcf 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit bc50f90011752792c40653470a619b6c68e5d3b4 +Subproject commit 061addcfbbedeeb93079502220c15184d1da130e diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 50c50ef7..59c557e7 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 50c50ef7b8481c01d49a295af63e8d4c8df5ff38 +Subproject commit 59c557e75d55001e43dc882484728e3f2fcabde2 diff --git a/qtxmlpatterns b/qtxmlpatterns index 0d64c407..84921c98 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0d64c4076d51bdbaa8c7335c21b512ee45b9a97a +Subproject commit 84921c981414c1858b4302d16b98a7cb75593e0c From 56d9eaba8f6699c6635f76277aedde7a2fbb992b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 Jan 2013 17:30:16 +0200 Subject: [PATCH 02/42] Updated submodules. Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 05659223..32953783 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 05659223bf02c8bac0463fe1e7a9364ef5677b75 +Subproject commit 3295378325c1b4567379d641f05e9eadea35040c diff --git a/qtdeclarative b/qtdeclarative index 7830710e..6651fc2f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7830710e57cbbbc8a2fb37fc97eb99f552ecdd83 +Subproject commit 6651fc2f178a279a0483b24714107ffcecb83dcb diff --git a/qtimageformats b/qtimageformats index c5b60caf..61c543dd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c5b60caf11a22f179aea0b207e9480fc2fdebd4d +Subproject commit 61c543dd72f0a1f5ff07e156d537b7ca88364330 diff --git a/qtmultimedia b/qtmultimedia index 2a7b4962..39439409 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2a7b4962a141939eb6efb63fc5834cb7a00141a6 +Subproject commit 39439409236c791bf307fd8b46ab7e03af254502 diff --git a/qtqa b/qtqa index 994d6a28..06bb3e65 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 994d6a280c2c9555424676cc1c4c1fd82faa7935 +Subproject commit 06bb3e65da251a155f8fe7eb6d932f265fdec372 diff --git a/qtquick1 b/qtquick1 index aed7aa45..4de07884 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit aed7aa451f582a772368b80506c7e26c3e8c18a2 +Subproject commit 4de078842ae87a091567503e66c0162b7ac50ccd diff --git a/qttools b/qttools index 7cc1af65..baaeee4d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7cc1af6542c960c17ccfef02de943a35edcbb5df +Subproject commit baaeee4d711bd2a8ef5d4472ede6f33534f73e30 From a2d9fb7323ba08ccd1cf08752073efd212012da4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 12 Jan 2013 06:35:46 +0200 Subject: [PATCH 03/42] Updated submodules. Change-Id: I56d9eaba8f6699c6635f76277aedde7a2fbb992b Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 32953783..94649b4c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3295378325c1b4567379d641f05e9eadea35040c +Subproject commit 94649b4cbd174c12aae4c7a2341067c8331379f6 diff --git a/qtqa b/qtqa index 06bb3e65..e9f870d0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 06bb3e65da251a155f8fe7eb6d932f265fdec372 +Subproject commit e9f870d024deff52e90b6c76a99df27160700f63 From 0381f7bd543fc1cdb5241a52d2c4cd96385a6a1f Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 12 Jan 2013 22:40:31 +0100 Subject: [PATCH 04/42] Updated submodules. Change-Id: Ic95561b551e1b777dd164d5dfc865f6f02f1c0b4 Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 31d7f4b4..7d957bda 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 31d7f4b4e631d08cbb7160027d849057abbd41f2 +Subproject commit 7d957bda7bb7fc0d2f79cd4468abf47e1497075b diff --git a/qtbase b/qtbase index 94649b4c..4d2eb3dd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 94649b4cbd174c12aae4c7a2341067c8331379f6 +Subproject commit 4d2eb3dd01620f4e26f97dca747206ddbc0840c7 diff --git a/qtdeclarative b/qtdeclarative index 6651fc2f..b5149990 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6651fc2f178a279a0483b24714107ffcecb83dcb +Subproject commit b514999057ab9d70dee1135357c773aae754493d diff --git a/qtdoc b/qtdoc index f7cc32f0..a799f9b5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f7cc32f086ca69dbaf93e6d1dd23a7a7fafb5bc1 +Subproject commit a799f9b58f01dd32b12986f0b0eb47e1148cb7ce diff --git a/qtgraphicaleffects b/qtgraphicaleffects index f213905a..6a1d2f2c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit f213905ad6a755da57a8af904aa9c46ce9d7faca +Subproject commit 6a1d2f2ca54ad1d35887f111270eaad980f2f9f8 diff --git a/qtimageformats b/qtimageformats index 61c543dd..6bdc8e06 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 61c543dd72f0a1f5ff07e156d537b7ca88364330 +Subproject commit 6bdc8e067289ec168582ed0fea06588240e22fd6 diff --git a/qtmultimedia b/qtmultimedia index 39439409..c6b54f35 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 39439409236c791bf307fd8b46ab7e03af254502 +Subproject commit c6b54f3521bb06c80106ca5a820c5dfd3ca2b093 diff --git a/qtquick1 b/qtquick1 index 4de07884..758349e7 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 4de078842ae87a091567503e66c0162b7ac50ccd +Subproject commit 758349e729134061bb29583846826c47badb0472 diff --git a/qtscript b/qtscript index 3efa6b0d..c648313b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3efa6b0da84d983f21370e4010ba44eb84e0070a +Subproject commit c648313b1eb5dada1839d85e166d5288ceb3af2f diff --git a/qtsvg b/qtsvg index 5c44a5e1..07ec4eea 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5c44a5e161794a96f63ab41037f97e6579bf5586 +Subproject commit 07ec4eea64ac0d922a4ceb86ea56d15d6e759075 diff --git a/qttools b/qttools index baaeee4d..0439b71d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit baaeee4d711bd2a8ef5d4472ede6f33534f73e30 +Subproject commit 0439b71d1cb9d741cebb3cccc09d644685b1be96 diff --git a/qtwebkit b/qtwebkit index 061addcf..82dc890b 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 061addcfbbedeeb93079502220c15184d1da130e +Subproject commit 82dc890b968922cecfa59a910f6dcb33fc35eb75 diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 59c557e7..049d8326 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 59c557e75d55001e43dc882484728e3f2fcabde2 +Subproject commit 049d83269d002bac8ebbe41668c9a86a82d9b804 diff --git a/qtxmlpatterns b/qtxmlpatterns index 84921c98..7ca430d7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84921c981414c1858b4302d16b98a7cb75593e0c +Subproject commit 7ca430d7a5eae175cd20b85d4f4277a962d2e671 From 7514c6e0f62ccd168c0081f83c9e4c0248e7e130 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 13 Jan 2013 14:35:25 +0200 Subject: [PATCH 05/42] Updated submodules. Change-Id: Ia2d9fb7323ba08ccd1cf08752073efd212012da4 Reviewed-by: Sergio Ahumada --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index b5149990..c78f9717 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b514999057ab9d70dee1135357c773aae754493d +Subproject commit c78f9717581ca579a88a6a47902f5dc99b696f15 From afb0caec7665e3d3f7b0c8e8c00ed4616734f163 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Jan 2013 22:35:39 +0200 Subject: [PATCH 06/42] Updated submodules. Change-Id: I7514c6e0f62ccd168c0081f83c9e4c0248e7e130 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 4d2eb3dd..4cad9e46 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4d2eb3dd01620f4e26f97dca747206ddbc0840c7 +Subproject commit 4cad9e466784ec54e3cf6f216d3df20ba7a595b0 diff --git a/qtdoc b/qtdoc index a799f9b5..34fce864 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a799f9b58f01dd32b12986f0b0eb47e1148cb7ce +Subproject commit 34fce8643597d620217c85facea824f64a287009 diff --git a/qtqa b/qtqa index e9f870d0..b2221fac 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e9f870d024deff52e90b6c76a99df27160700f63 +Subproject commit b2221faca328d173e4cb91b75a4cce90cb5568dd From a0270c339333b78457e2397709353c86483ce8ae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 Jan 2013 22:45:04 +0200 Subject: [PATCH 07/42] Updated submodules. Change-Id: Iafb0caec7665e3d3f7b0c8e8c00ed4616734f163 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtrepotools | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 4cad9e46..618fe66d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4cad9e466784ec54e3cf6f216d3df20ba7a595b0 +Subproject commit 618fe66d5bc9a3165bdb4f30ce85cbf2305b6540 diff --git a/qtdoc b/qtdoc index 34fce864..e32762cf 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 34fce8643597d620217c85facea824f64a287009 +Subproject commit e32762cf73040126a6313fb268e30c2ebab46543 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 6a1d2f2c..7ca1b0d0 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 6a1d2f2ca54ad1d35887f111270eaad980f2f9f8 +Subproject commit 7ca1b0d0f279ab5556947c2cf494c1498d94f9b1 diff --git a/qtrepotools b/qtrepotools index 71131585..ef4f1434 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7113158570728898adc4ae92483c05002bcb80ad +Subproject commit ef4f1434841acb955ecf586b168e83f70d4e9e1c diff --git a/qttools b/qttools index 0439b71d..86cd4b7d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0439b71d1cb9d741cebb3cccc09d644685b1be96 +Subproject commit 86cd4b7dc01c98c1a483b578a8e44023c2358ee8 From 3f1cc2e9387ac936ad9d02cff409798da9cd9835 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 17 Jan 2013 22:44:48 +0200 Subject: [PATCH 08/42] Updated submodules. Change-Id: Ia0270c339333b78457e2397709353c86483ce8ae Reviewed-by: Sergio Ahumada --- qtdeclarative | 2 +- qtmultimedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index c78f9717..fc0e9167 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c78f9717581ca579a88a6a47902f5dc99b696f15 +Subproject commit fc0e916784b88a3a9ad12263ecc617c0a383664e diff --git a/qtmultimedia b/qtmultimedia index c6b54f35..8e6ffcc6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c6b54f3521bb06c80106ca5a820c5dfd3ca2b093 +Subproject commit 8e6ffcc6afe984cc9598184c9a71cdf377674597 From 319b198bbf22c551bc05a308211cb1666f520d89 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 18 Jan 2013 22:44:43 +0200 Subject: [PATCH 09/42] Updated submodules. Change-Id: I3f1cc2e9387ac936ad9d02cff409798da9cd9835 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 618fe66d..5607259c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 618fe66d5bc9a3165bdb4f30ce85cbf2305b6540 +Subproject commit 5607259cccfa89111165c852238c808e371d5f33 From 371d08eb4a1e748e042c09a872af9bcb6e03b405 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 21 Jan 2013 22:35:39 +0200 Subject: [PATCH 10/42] Updated submodules. Change-Id: I319b198bbf22c551bc05a308211cb1666f520d89 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdoc | 2 +- qtscript | 2 +- qttools | 2 +- qtwebkit-examples-and-demos | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 5607259c..498dfa3d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5607259cccfa89111165c852238c808e371d5f33 +Subproject commit 498dfa3de70a606edf52d10e5c597a60afc1d2c2 diff --git a/qtdoc b/qtdoc index e32762cf..9de87e49 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e32762cf73040126a6313fb268e30c2ebab46543 +Subproject commit 9de87e4976321f9063e92cfe93f89a1ed2889eb1 diff --git a/qtscript b/qtscript index c648313b..848ddbe9 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c648313b1eb5dada1839d85e166d5288ceb3af2f +Subproject commit 848ddbe91b5219214f43892d325d7e5e9ddc0489 diff --git a/qttools b/qttools index 86cd4b7d..f5504bb8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 86cd4b7dc01c98c1a483b578a8e44023c2358ee8 +Subproject commit f5504bb8df83bb0b011f57b4bd0caa60f29c932e diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 049d8326..276c5353 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 049d83269d002bac8ebbe41668c9a86a82d9b804 +Subproject commit 276c53531a95ce3f1f00c5c445e19584ac077917 From 2f43917c1d4b3648615c52d4fe012d44561e5d0c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Jan 2013 16:43:23 +0200 Subject: [PATCH 11/42] Updated submodules. Change-Id: I371d08eb4a1e748e042c09a872af9bcb6e03b405 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 498dfa3d..b67a98af 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 498dfa3de70a606edf52d10e5c597a60afc1d2c2 +Subproject commit b67a98afc8cf3d83050e50ea3ece8531c782eb84 diff --git a/qtdeclarative b/qtdeclarative index fc0e9167..6bffd4b5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fc0e916784b88a3a9ad12263ecc617c0a383664e +Subproject commit 6bffd4b52ddf1d5040936cc2f387b7dc99ad0cfc diff --git a/qtdoc b/qtdoc index 9de87e49..5f78a12d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9de87e4976321f9063e92cfe93f89a1ed2889eb1 +Subproject commit 5f78a12da62e8ae406d2a01f92e70632d96b5322 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7ca1b0d0..df913987 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7ca1b0d0f279ab5556947c2cf494c1498d94f9b1 +Subproject commit df9139872286c1bc123010a3c42a6010d2528378 diff --git a/qtmultimedia b/qtmultimedia index 8e6ffcc6..35393a64 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8e6ffcc6afe984cc9598184c9a71cdf377674597 +Subproject commit 35393a6469a5d886c415e947be788b206c7ea76d diff --git a/qtqa b/qtqa index b2221fac..2fe57b53 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b2221faca328d173e4cb91b75a4cce90cb5568dd +Subproject commit 2fe57b53de3e8c8aa5f937bdc18549db9999efd6 diff --git a/qtrepotools b/qtrepotools index ef4f1434..30a8d896 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ef4f1434841acb955ecf586b168e83f70d4e9e1c +Subproject commit 30a8d89618f3a885d8e645cbae15ccb8b76f9538 diff --git a/qtscript b/qtscript index 848ddbe9..8759cf3f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 848ddbe91b5219214f43892d325d7e5e9ddc0489 +Subproject commit 8759cf3fcb3b78a7b62e7f4feedee8e6822bde32 diff --git a/qtsvg b/qtsvg index 07ec4eea..059802d7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 07ec4eea64ac0d922a4ceb86ea56d15d6e759075 +Subproject commit 059802d705b2adda8ccacdf1948d05a918d8a9ef diff --git a/qttools b/qttools index f5504bb8..206897d9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f5504bb8df83bb0b011f57b4bd0caa60f29c932e +Subproject commit 206897d96f337f139870a2eaf173543898e7cc29 diff --git a/qtwebkit b/qtwebkit index 82dc890b..81cb91bb 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 82dc890b968922cecfa59a910f6dcb33fc35eb75 +Subproject commit 81cb91bb6b34f10cb4f1e8da9a0dccc6a9b4a2c4 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7ca430d7..1bc40736 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7ca430d7a5eae175cd20b85d4f4277a962d2e671 +Subproject commit 1bc407365d3cf61ecbfc7e3136d0b3bd8bc7fcb7 From 6623ffc4ec271ae5769382d1f6cbd7e475089270 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 23 Jan 2013 12:33:03 +0100 Subject: [PATCH 12/42] Doc: Added information about the documentation in qt5/README file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -added basic information and links to wiki and qtbase/doc/README file. Task-number: QTBUG-29057 Change-Id: I21d4dbaf7c1d03b63949af1fa303cb6fcbee8949 Reviewed-by: Johanna Äijälä Reviewed-by: Sergio Ahumada --- README | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README b/README index b1c97a49..802c3545 100644 --- a/README +++ b/README @@ -122,3 +122,22 @@ HOW TO BUILD QT5 ===================== See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git for more information. + + + Documentation + ============= + + After the configure step, building the documentation is possible by running + "make docs". + Example: + + ./configure -prefix $PWD/qtbase -opensource + make docs + + The documentation is installed in the path set to $QT_INSTALL_DOCS. + Running "qmake -query" will list the value of QT_INSTALL_DOCS. + + Information about Qt 5's documentation is located in qtbase/doc/README + or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject + + Note: Building the documentation is only tested on desktop platforms. From 79193d2b4d9b58e1b4928857156e1523ea970b74 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 26 Jan 2013 06:35:50 +0200 Subject: [PATCH 13/42] Updated submodules. Change-Id: I2f43917c1d4b3648615c52d4fe012d44561e5d0c Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index b67a98af..1fbfbf6b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b67a98afc8cf3d83050e50ea3ece8531c782eb84 +Subproject commit 1fbfbf6b6e50a6c2e3ce4eae72709ea53f56c4ab diff --git a/qtdoc b/qtdoc index 5f78a12d..74f71cf2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5f78a12da62e8ae406d2a01f92e70632d96b5322 +Subproject commit 74f71cf2286bb95c2cb765a6f8f509136dffad4d diff --git a/qtmultimedia b/qtmultimedia index 35393a64..a45d35c0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 35393a6469a5d886c415e947be788b206c7ea76d +Subproject commit a45d35c07f9eed27fc286ab5fbc00789d45259b5 From 347949e258d3c75ad506aefa2a28712266007c15 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 27 Jan 2013 14:45:10 +0200 Subject: [PATCH 14/42] Updated submodules. Change-Id: I79193d2b4d9b58e1b4928857156e1523ea970b74 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 1fbfbf6b..ff9aa64c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1fbfbf6b6e50a6c2e3ce4eae72709ea53f56c4ab +Subproject commit ff9aa64c99bf04f7e45ee80c6c9fb4e0e69e9511 From b3ef11f427b3e47b9e725c66a60f64acb532aced Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 28 Jan 2013 22:45:56 +0200 Subject: [PATCH 15/42] Updated submodules. Change-Id: I347949e258d3c75ad506aefa2a28712266007c15 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtwebkit | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index ff9aa64c..f4065db1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ff9aa64c99bf04f7e45ee80c6c9fb4e0e69e9511 +Subproject commit f4065db172f11b751af03c04a21bd0b4097d1779 diff --git a/qtdeclarative b/qtdeclarative index 6bffd4b5..f4d4689d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6bffd4b52ddf1d5040936cc2f387b7dc99ad0cfc +Subproject commit f4d4689d3c09cb4eae30be892be426d4fa185ed4 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index df913987..1829dc82 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit df9139872286c1bc123010a3c42a6010d2528378 +Subproject commit 1829dc82cac3657c31c7c5455f8d9d84540eec8f diff --git a/qtmultimedia b/qtmultimedia index a45d35c0..b01c8274 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a45d35c07f9eed27fc286ab5fbc00789d45259b5 +Subproject commit b01c8274fd937358eb7b37b15a36f0a70e861480 diff --git a/qtrepotools b/qtrepotools index 30a8d896..d8551dda 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 30a8d89618f3a885d8e645cbae15ccb8b76f9538 +Subproject commit d8551dda06e4f3dbf3b7aab347a4b6449d5772f4 diff --git a/qtscript b/qtscript index 8759cf3f..3b26f6f6 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 8759cf3fcb3b78a7b62e7f4feedee8e6822bde32 +Subproject commit 3b26f6f6643978c9d041a6267dc88e2a59ced763 diff --git a/qtwebkit b/qtwebkit index 81cb91bb..30400131 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 81cb91bb6b34f10cb4f1e8da9a0dccc6a9b4a2c4 +Subproject commit 30400131a4c18e9a0e0895d517c620b599aaddee From 585c525fd1d770cee6967f1c722e78fd5a0976c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Jan 2013 22:45:27 +0200 Subject: [PATCH 16/42] Updated submodules. Change-Id: Ib3ef11f427b3e47b9e725c66a60f64acb532aced Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtmultimedia | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index f4065db1..7c38be7e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f4065db172f11b751af03c04a21bd0b4097d1779 +Subproject commit 7c38be7e0c085d1d6590324f697af29734e0793d diff --git a/qtmultimedia b/qtmultimedia index b01c8274..1f242764 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b01c8274fd937358eb7b37b15a36f0a70e861480 +Subproject commit 1f2427642d2aa2e11318f7e5f968fb563f40d24b From ce407c128354a3c45d3894f852b8977c78ffe96b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Mar 2013 22:45:45 +0200 Subject: [PATCH 17/42] Updated submodules. Change-Id: I585c525fd1d770cee6967f1c722e78fd5a0976c5 Reviewed-by: Iikka Eklund --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 7d957bda..d6b64899 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7d957bda7bb7fc0d2f79cd4468abf47e1497075b +Subproject commit d6b64899a00ab96c8bf3aac03acc5a7c2aff28a3 diff --git a/qtbase b/qtbase index 7c38be7e..a65982d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7c38be7e0c085d1d6590324f697af29734e0793d +Subproject commit a65982d659226ace42fe0a0ca0a2f15523e95e4b diff --git a/qtdeclarative b/qtdeclarative index f4d4689d..a57ce3d8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f4d4689d3c09cb4eae30be892be426d4fa185ed4 +Subproject commit a57ce3d8c1f098565d044993dbd8fa6cd5fb05b8 diff --git a/qtdoc b/qtdoc index 74f71cf2..7e4d555a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 74f71cf2286bb95c2cb765a6f8f509136dffad4d +Subproject commit 7e4d555a4c907302d58c56c75ba415c350599911 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 1829dc82..28602be6 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 1829dc82cac3657c31c7c5455f8d9d84540eec8f +Subproject commit 28602be6bfc1601d260519b4be529e8b25a82506 diff --git a/qtimageformats b/qtimageformats index 6bdc8e06..9efbd143 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6bdc8e067289ec168582ed0fea06588240e22fd6 +Subproject commit 9efbd143281e7f657b4e1415b5bdcad28f5c335c diff --git a/qtjsbackend b/qtjsbackend index b2b83f01..04efcdf2 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit b2b83f01312e945237aa1aacadd4476133bf4038 +Subproject commit 04efcdf23b77c9dfdee25070a849523c835883a6 diff --git a/qtmultimedia b/qtmultimedia index 1f242764..0f9ae06f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1f2427642d2aa2e11318f7e5f968fb563f40d24b +Subproject commit 0f9ae06f317d3aab07b35010a11ef0658afbec22 diff --git a/qtqa b/qtqa index 2fe57b53..f5c3699e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 2fe57b53de3e8c8aa5f937bdc18549db9999efd6 +Subproject commit f5c3699e9fd8c58a84076a875b7d4a0cf43cab02 diff --git a/qtquick1 b/qtquick1 index 758349e7..60686a20 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 758349e729134061bb29583846826c47badb0472 +Subproject commit 60686a20c7bb669d16d99a16ca8a8f96695f1684 diff --git a/qtrepotools b/qtrepotools index d8551dda..6a672270 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d8551dda06e4f3dbf3b7aab347a4b6449d5772f4 +Subproject commit 6a672270cc3300606099b17d96ee94a0859bf567 diff --git a/qtscript b/qtscript index 3b26f6f6..4f870757 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3b26f6f6643978c9d041a6267dc88e2a59ced763 +Subproject commit 4f8707575a03ee76b9827c3f0afd623ff2eff0db diff --git a/qtsvg b/qtsvg index 059802d7..7f5de2ce 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 059802d705b2adda8ccacdf1948d05a918d8a9ef +Subproject commit 7f5de2ce90c84193885cddadd7bae7da9f8bb164 diff --git a/qttools b/qttools index 206897d9..3792f777 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 206897d96f337f139870a2eaf173543898e7cc29 +Subproject commit 3792f777185544a6b89687a96d3c17a81e34b7a6 diff --git a/qttranslations b/qttranslations index e225d71c..3928bb7d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e225d71c9e1e02ca6cc91eb9e6f0322e185c98bf +Subproject commit 3928bb7da27de9ec958288b24239e6cc6eb44576 diff --git a/qtwebkit b/qtwebkit index 30400131..34983cc9 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 30400131a4c18e9a0e0895d517c620b599aaddee +Subproject commit 34983cc93dadd6f1be4f1088ba69d6a060cee15e diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 276c5353..fd56ce60 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 276c53531a95ce3f1f00c5c445e19584ac077917 +Subproject commit fd56ce60ffe2ebbaa508a0965e4e94651a8139c0 diff --git a/qtxmlpatterns b/qtxmlpatterns index 1bc40736..2a4e8b25 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1bc407365d3cf61ecbfc7e3136d0b3bd8bc7fcb7 +Subproject commit 2a4e8b258ed68abc9a7f8d4900cb45d4aba5aebf From b99b4bc0701257d213af7d1a02d03c047bacd46e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 19 Mar 2013 14:37:53 +0200 Subject: [PATCH 18/42] Updated submodules. Change-Id: Ice407c128354a3c45d3894f852b8977c78ffe96b Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtqa | 2 +- qtrepotools | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index a65982d6..d76b0d9c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a65982d659226ace42fe0a0ca0a2f15523e95e4b +Subproject commit d76b0d9c6f55982192be17a8164a0cfed45d063d diff --git a/qtqa b/qtqa index f5c3699e..4664835c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f5c3699e9fd8c58a84076a875b7d4a0cf43cab02 +Subproject commit 4664835c9dfa6f91d6c6080f91c3825118d60e93 diff --git a/qtrepotools b/qtrepotools index 6a672270..850fa50c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 6a672270cc3300606099b17d96ee94a0859bf567 +Subproject commit 850fa50ca4e58593f4953fb3e55e1c8d47012310 diff --git a/qttools b/qttools index 3792f777..b5a32f91 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3792f777185544a6b89687a96d3c17a81e34b7a6 +Subproject commit b5a32f91f343c2ea905c1af72cb99a854ce81ff0 From 5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Mar 2013 15:05:34 +0200 Subject: [PATCH 19/42] Updated submodules. Change-Id: Ib99b4bc0701257d213af7d1a02d03c047bacd46e Reviewed-by: Sergio Ahumada --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebkit | 2 +- qtwebkit-examples-and-demos | 2 +- qtxmlpatterns | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index d6b64899..de06fb45 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d6b64899a00ab96c8bf3aac03acc5a7c2aff28a3 +Subproject commit de06fb45694171f5c914d8a61b17f6068b44a6c2 diff --git a/qtbase b/qtbase index d76b0d9c..0127adbe 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d76b0d9c6f55982192be17a8164a0cfed45d063d +Subproject commit 0127adbe2c38ab50f87376ce05cbbb1ed92c2901 diff --git a/qtdeclarative b/qtdeclarative index a57ce3d8..535695f0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a57ce3d8c1f098565d044993dbd8fa6cd5fb05b8 +Subproject commit 535695f01c02ee13d499ab59c3b23354fc3da564 diff --git a/qtdoc b/qtdoc index 7e4d555a..62f2cd20 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7e4d555a4c907302d58c56c75ba415c350599911 +Subproject commit 62f2cd20f6d1098d461987f497c9f80ae7a870df diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 28602be6..a567c47b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 28602be6bfc1601d260519b4be529e8b25a82506 +Subproject commit a567c47b3785fafb51c6db0f660c3af198968271 diff --git a/qtimageformats b/qtimageformats index 9efbd143..bacb0bec 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9efbd143281e7f657b4e1415b5bdcad28f5c335c +Subproject commit bacb0bec3cc2b409b215093f8e6ea3ff00c2af45 diff --git a/qtqa b/qtqa index 4664835c..f59e04e2 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4664835c9dfa6f91d6c6080f91c3825118d60e93 +Subproject commit f59e04e2b3e46134462c34f5627ef35056538d8c diff --git a/qtquick1 b/qtquick1 index 60686a20..d259d291 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 60686a20c7bb669d16d99a16ca8a8f96695f1684 +Subproject commit d259d29158f0c7404ca9c93b9e9598d314dde494 diff --git a/qtrepotools b/qtrepotools index 850fa50c..d564c127 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 850fa50ca4e58593f4953fb3e55e1c8d47012310 +Subproject commit d564c1279d143d52634bdcd311c892daf7b31336 diff --git a/qtscript b/qtscript index 4f870757..965c36d8 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 4f8707575a03ee76b9827c3f0afd623ff2eff0db +Subproject commit 965c36d851d3bac437939b641afed6554a75e35d diff --git a/qtsvg b/qtsvg index 7f5de2ce..95fca593 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7f5de2ce90c84193885cddadd7bae7da9f8bb164 +Subproject commit 95fca593cb08b3755cc72df6169afad9f75f0a7f diff --git a/qttools b/qttools index b5a32f91..207da54c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b5a32f91f343c2ea905c1af72cb99a854ce81ff0 +Subproject commit 207da54ca5b4d38eceb8e867e78dad922e9b0d9c diff --git a/qtwebkit b/qtwebkit index 34983cc9..3b5bc047 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 34983cc93dadd6f1be4f1088ba69d6a060cee15e +Subproject commit 3b5bc047e2dcdef835026a71f72c0f80bd5559ba diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index fd56ce60..28e34097 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit fd56ce60ffe2ebbaa508a0965e4e94651a8139c0 +Subproject commit 28e3409731241d727bca48be6b04cdacce463a10 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2a4e8b25..5c0c8f25 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2a4e8b258ed68abc9a7f8d4900cb45d4aba5aebf +Subproject commit 5c0c8f258f66a057ba3597e86c00f1e8e30504b7 From 3a3420b02efdbc26843a5b84f81399d059ed84a6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Mar 2013 11:26:27 +0200 Subject: [PATCH 20/42] Updated submodules. Change-Id: I5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtrepotools | 2 +- qtwebkit-examples-and-demos | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 0127adbe..67860007 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0127adbe2c38ab50f87376ce05cbbb1ed92c2901 +Subproject commit 6786000790f18f7fe56fe64dd7969e4a8fe9513b diff --git a/qtdoc b/qtdoc index 62f2cd20..5fdaa2bc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 62f2cd20f6d1098d461987f497c9f80ae7a870df +Subproject commit 5fdaa2bca2edebaad9d54970622702565e7aae64 diff --git a/qtmultimedia b/qtmultimedia index 0f9ae06f..daa8e229 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0f9ae06f317d3aab07b35010a11ef0658afbec22 +Subproject commit daa8e229dae3b1bc727428f9836c9ae026d357f5 diff --git a/qtqa b/qtqa index f59e04e2..e7115f55 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f59e04e2b3e46134462c34f5627ef35056538d8c +Subproject commit e7115f55a8d7d621da46654030a72ca7ae144b56 diff --git a/qtquick1 b/qtquick1 index d259d291..5ed36a9f 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit d259d29158f0c7404ca9c93b9e9598d314dde494 +Subproject commit 5ed36a9fe84f78c66692bb4a0395cb09eaf31d66 diff --git a/qtrepotools b/qtrepotools index d564c127..04d2f7cb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d564c1279d143d52634bdcd311c892daf7b31336 +Subproject commit 04d2f7cbdb87ef3a4d44d88bb363669d75047e49 diff --git a/qtwebkit-examples-and-demos b/qtwebkit-examples-and-demos index 28e34097..b207fe50 160000 --- a/qtwebkit-examples-and-demos +++ b/qtwebkit-examples-and-demos @@ -1 +1 @@ -Subproject commit 28e3409731241d727bca48be6b04cdacce463a10 +Subproject commit b207fe504c57768358c02fc03c53716aa91658fb From b47a94b9fbb092770db220b59f13e6d64d0007c3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Mar 2013 16:38:20 +0200 Subject: [PATCH 21/42] Updated submodules. Change-Id: I3a3420b02efdbc26843a5b84f81399d059ed84a6 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 67860007..3eafd2e7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6786000790f18f7fe56fe64dd7969e4a8fe9513b +Subproject commit 3eafd2e7d841c2c4dac1055a3eb38f871a307cca diff --git a/qtdeclarative b/qtdeclarative index 535695f0..4bcb0361 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 535695f01c02ee13d499ab59c3b23354fc3da564 +Subproject commit 4bcb0361d93e2f2264f67d4b8c6d03daeb1e80d3 diff --git a/qtmultimedia b/qtmultimedia index daa8e229..2d8ad606 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit daa8e229dae3b1bc727428f9836c9ae026d357f5 +Subproject commit 2d8ad6066d59075ebb20ae880af00eaba027d5e9 From 231887b543d339740f1d1d49f96fc2f07f173030 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 26 Mar 2013 13:04:31 +0200 Subject: [PATCH 22/42] Updated submodules. Change-Id: Ib47a94b9fbb092770db220b59f13e6d64d0007c3 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 3eafd2e7..787aa7a2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3eafd2e7d841c2c4dac1055a3eb38f871a307cca +Subproject commit 787aa7a2a8a261f120199ef73e20c03bf212097f From 696ab3466b90a23906ec5d609bb504f073eef21f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 30 Mar 2013 14:36:35 +0200 Subject: [PATCH 23/42] Updated submodules. Change-Id: I231887b543d339740f1d1d49f96fc2f07f173030 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscript | 2 +- qttools | 2 +- qtwebkit | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 787aa7a2..c9f697a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 787aa7a2a8a261f120199ef73e20c03bf212097f +Subproject commit c9f697a1d0a21afef68b5bba451d0ce2dbdfe03e diff --git a/qtdeclarative b/qtdeclarative index 4bcb0361..2223f1ae 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4bcb0361d93e2f2264f67d4b8c6d03daeb1e80d3 +Subproject commit 2223f1ae293c2aedf4759564185f74b782395459 diff --git a/qtqa b/qtqa index e7115f55..898d1ded 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e7115f55a8d7d621da46654030a72ca7ae144b56 +Subproject commit 898d1dede297d164a02e8e027fc46242b6005be2 diff --git a/qtrepotools b/qtrepotools index 04d2f7cb..5453e0fb 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 04d2f7cbdb87ef3a4d44d88bb363669d75047e49 +Subproject commit 5453e0fb3133cd2e0a10d2b056f5873343a42e6d diff --git a/qtscript b/qtscript index 965c36d8..59c34257 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 965c36d851d3bac437939b641afed6554a75e35d +Subproject commit 59c342572fc2cda2cd53ae60f215c095083bbf58 diff --git a/qttools b/qttools index 207da54c..1b02287e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 207da54ca5b4d38eceb8e867e78dad922e9b0d9c +Subproject commit 1b02287e464efc999dda10ff57c0207e6f3648d5 diff --git a/qtwebkit b/qtwebkit index 3b5bc047..aca7ee6e 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 3b5bc047e2dcdef835026a71f72c0f80bd5559ba +Subproject commit aca7ee6efbdd8a149ce6135df54cc93fbe362922 From f618a97229d55cf58fb668fbeaa4a7b0b47f3b14 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Apr 2013 16:26:37 +0300 Subject: [PATCH 24/42] Updated submodules. Change-Id: I696ab3466b90a23906ec5d609bb504f073eef21f Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtqa | 2 +- qtrepotools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index c9f697a1..e777e3f1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c9f697a1d0a21afef68b5bba451d0ce2dbdfe03e +Subproject commit e777e3f1ecc72d0958386ac6975c45c8d36081f1 diff --git a/qtqa b/qtqa index 898d1ded..fcec9b11 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 898d1dede297d164a02e8e027fc46242b6005be2 +Subproject commit fcec9b114a7d5c5249c433202d7616f89120f512 diff --git a/qtrepotools b/qtrepotools index 5453e0fb..93d3cf19 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 5453e0fb3133cd2e0a10d2b056f5873343a42e6d +Subproject commit 93d3cf19cb519c0505b742872a0f21be1b5f2326 From 3f9837797d4fc5226d4f6063ee6a52b349521155 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Apr 2013 19:20:13 +0300 Subject: [PATCH 25/42] Updated submodules. Change-Id: If618a97229d55cf58fb668fbeaa4a7b0b47f3b14 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtrepotools | 2 +- qttranslations | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index e777e3f1..967c18d2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e777e3f1ecc72d0958386ac6975c45c8d36081f1 +Subproject commit 967c18d29694fdeab858691a80cb8400fd02ec33 diff --git a/qtrepotools b/qtrepotools index 93d3cf19..7b19e265 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 93d3cf19cb519c0505b742872a0f21be1b5f2326 +Subproject commit 7b19e265b40f54e0c8acd4e8c5b54958f31b02f8 diff --git a/qttranslations b/qttranslations index 3928bb7d..438b596f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3928bb7da27de9ec958288b24239e6cc6eb44576 +Subproject commit 438b596f3e42f186017940b185116d8c36bece53 From a0267228f9d8240adc71d9842a6fe82c91ab6082 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 28 May 2013 13:22:15 +0200 Subject: [PATCH 26/42] Updated submodules. Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5 Reviewed-by: Iikka Eklund --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtjsbackend | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index de06fb45..891d912f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit de06fb45694171f5c914d8a61b17f6068b44a6c2 +Subproject commit 891d912f45b7217d7a8d40fb6b277ca393f21a93 diff --git a/qtbase b/qtbase index 967c18d2..875480ed 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 967c18d29694fdeab858691a80cb8400fd02ec33 +Subproject commit 875480ed99f4c2fa4a65f7c4fc1c3823024519f0 diff --git a/qtdeclarative b/qtdeclarative index 2223f1ae..43484528 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2223f1ae293c2aedf4759564185f74b782395459 +Subproject commit 43484528552cb2ba3dc1dabfcce22ed40bf4f8db diff --git a/qtdoc b/qtdoc index 5fdaa2bc..1f373fbe 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5fdaa2bca2edebaad9d54970622702565e7aae64 +Subproject commit 1f373fbe5c174fe7951d2c8bbbe235e4eaa6205a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a567c47b..535c6978 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a567c47b3785fafb51c6db0f660c3af198968271 +Subproject commit 535c6978fdb11b58ba65873d0105b5e90219c5de diff --git a/qtimageformats b/qtimageformats index bacb0bec..aa3c1a3b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bacb0bec3cc2b409b215093f8e6ea3ff00c2af45 +Subproject commit aa3c1a3b51f0f89afd83ffd62d38765489c40d06 diff --git a/qtjsbackend b/qtjsbackend index 04efcdf2..30a8abf6 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit 04efcdf23b77c9dfdee25070a849523c835883a6 +Subproject commit 30a8abf65e8fd08baaa972fb79af060043895215 diff --git a/qtmultimedia b/qtmultimedia index 2d8ad606..0f94c426 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2d8ad6066d59075ebb20ae880af00eaba027d5e9 +Subproject commit 0f94c426838360704abab890b04973173712caa4 diff --git a/qtqa b/qtqa index 6c3a3fb3..59e85d63 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6c3a3fb3da4e43de26ea94d0cc383445a2d095ae +Subproject commit 59e85d6397fb51bbd6547a7a6ce1895fb93f62cb diff --git a/qtquick1 b/qtquick1 index 5ed36a9f..d695eb29 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 5ed36a9fe84f78c66692bb4a0395cb09eaf31d66 +Subproject commit d695eb29a2d36c05dac5fab97e0ba7ea98acef20 diff --git a/qtquickcontrols b/qtquickcontrols index 41a3aa4b..960a78ae 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 41a3aa4b619e1c138aa20bdfb9e721e8d654c33a +Subproject commit 960a78ae6231767a34a6e4de76bf4fa28ff401f1 diff --git a/qtscript b/qtscript index 59c34257..e2415c8b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 59c342572fc2cda2cd53ae60f215c095083bbf58 +Subproject commit e2415c8b957a41345284f56d11cd276d5e4e9267 diff --git a/qtsensors b/qtsensors index c7dff2e5..4dca8393 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c7dff2e520cbf6fcec414d0b04c2c133e5eb5af3 +Subproject commit 4dca8393f1ea472cd9cc9b70bf2c6617c6e6355f diff --git a/qtserialport b/qtserialport index d424c1ee..f3015913 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d424c1ee4494baffdc4715440f86ef80a94fd7a5 +Subproject commit f30159132c2c486508d227fc7d5615e032df6f68 diff --git a/qtsvg b/qtsvg index 95fca593..0b7bb2bd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 95fca593cb08b3755cc72df6169afad9f75f0a7f +Subproject commit 0b7bb2bd2d7404c42dd782975b665c9415409e0c diff --git a/qttools b/qttools index 1b02287e..cd6eceba 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1b02287e464efc999dda10ff57c0207e6f3648d5 +Subproject commit cd6ecebad770932034b4b5efa8e288acc1c92c9e diff --git a/qttranslations b/qttranslations index 438b596f..248c4c86 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 438b596f3e42f186017940b185116d8c36bece53 +Subproject commit 248c4c86f8d7b06234761286d5d600fa2721eed8 diff --git a/qtwebkit b/qtwebkit index aca7ee6e..fb2adc6d 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit aca7ee6efbdd8a149ce6135df54cc93fbe362922 +Subproject commit fb2adc6de925b6045575e4cf3651356ce8f41814 diff --git a/qtwebkit-examples b/qtwebkit-examples index b207fe50..40533fc2 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit b207fe504c57768358c02fc03c53716aa91658fb +Subproject commit 40533fc252c88b18dab9124d3805d70bde0ecb5d diff --git a/qtx11extras b/qtx11extras index a03d4ddf..1a095bd1 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a03d4ddf0a8eda87e6a9043259f224a03d4bc68c +Subproject commit 1a095bd1f406b453cfea16312bbb0f258d370b59 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5c0c8f25..ce0f629b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5c0c8f258f66a057ba3597e86c00f1e8e30504b7 +Subproject commit ce0f629b741f268d0546a775d9d8f4eec99d21d0 From ad91faa3bdb0faa8c2d5b23b00addaf6af01989d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 May 2013 14:01:16 +0300 Subject: [PATCH 27/42] Updated submodules. Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 875480ed..89f219da 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 875480ed99f4c2fa4a65f7c4fc1c3823024519f0 +Subproject commit 89f219da0c720c326c4c3aa696141e368832ee43 diff --git a/qtdeclarative b/qtdeclarative index 43484528..3414cc6c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 43484528552cb2ba3dc1dabfcce22ed40bf4f8db +Subproject commit 3414cc6c7a4e021ec2c9a4f369acc2a0a0568c58 diff --git a/qtdoc b/qtdoc index 1f373fbe..3e627574 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1f373fbe5c174fe7951d2c8bbbe235e4eaa6205a +Subproject commit 3e627574e97ead8e8f8a18bd9a940974515a2ceb diff --git a/qtmultimedia b/qtmultimedia index 0f94c426..3196d386 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0f94c426838360704abab890b04973173712caa4 +Subproject commit 3196d3869eb564565e875929af6a913de5c30c53 diff --git a/qtquick1 b/qtquick1 index d695eb29..dfe77c25 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit d695eb29a2d36c05dac5fab97e0ba7ea98acef20 +Subproject commit dfe77c25412eedcfecfd738904c2714c53d1e3bb diff --git a/qtquickcontrols b/qtquickcontrols index 960a78ae..10851004 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 960a78ae6231767a34a6e4de76bf4fa28ff401f1 +Subproject commit 10851004e327f4ab798753c645ab987f10160100 diff --git a/qttools b/qttools index cd6eceba..cdc45628 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit cd6ecebad770932034b4b5efa8e288acc1c92c9e +Subproject commit cdc456281617cffc12e6f406d8e2c7fcf7e97144 From ecd64f626d3ee4c5766b45dc8bab9fc3fd494e88 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 29 May 2013 14:33:02 +0200 Subject: [PATCH 28/42] Add license files mandated by (L)GPL. Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d Reviewed-by: Janne Anttila --- LGPL_EXCEPTION.txt | 22 ++ LICENSE.FDL | 450 +++++++++++++++++++++++++ LICENSE.GPL | 674 +++++++++++++++++++++++++++++++++++++ LICENSE.LGPL | 514 ++++++++++++++++++++++++++++ LICENSE.PREVIEW.COMMERCIAL | 628 ++++++++++++++++++++++++++++++++++ 5 files changed, 2288 insertions(+) create mode 100644 LGPL_EXCEPTION.txt create mode 100644 LICENSE.FDL create mode 100644 LICENSE.GPL create mode 100644 LICENSE.LGPL create mode 100644 LICENSE.PREVIEW.COMMERCIAL diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt new file mode 100644 index 00000000..7e2e30ff --- /dev/null +++ b/LGPL_EXCEPTION.txt @@ -0,0 +1,22 @@ +Digia Qt LGPL Exception version 1.1 + +As an additional permission to the GNU Lesser General Public License version +2.1, the object code form of a "work that uses the Library" may incorporate +material from a header file that is part of the Library. You may distribute +such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + +Moreover, you may apply this exception to a modified version of the Library, +provided that such modification does not involve copying material from the +Library into the modified Library's header files unless such material is +limited to (i) numerical parameters; (ii) data structure layouts; +(iii) accessors; and (iv) small macros, templates and inline functions of +five lines or less in length. + +Furthermore, you are not required to apply this additional permission to a +modified version of the Library. diff --git a/LICENSE.FDL b/LICENSE.FDL new file mode 100644 index 00000000..938bb8da --- /dev/null +++ b/LICENSE.FDL @@ -0,0 +1,450 @@ + GNU Free Documentation License + Version 1.3, 3 November 2008 + + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The "publisher" means any person or entity that distributes copies of +the Document to the public. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. + +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. diff --git a/LICENSE.GPL b/LICENSE.GPL new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/LICENSE.GPL @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/LICENSE.LGPL b/LICENSE.LGPL new file mode 100644 index 00000000..3788d79e --- /dev/null +++ b/LICENSE.LGPL @@ -0,0 +1,514 @@ + GNU LESSER GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal + + You may use, distribute and copy the Qt GUI Toolkit under the terms of + GNU Lesser General Public License version 2.1, which is displayed below. + +------------------------------------------------------------------------- + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL new file mode 100644 index 00000000..e90ad1ac --- /dev/null +++ b/LICENSE.PREVIEW.COMMERCIAL @@ -0,0 +1,628 @@ +TECHNOLOGY PREVIEW LICENSE AGREEMENT + +For individuals and/or legal entities resident in the Americas (North +America, Central America and South America), the applicable licensing +terms are specified under the heading "Technology Preview License +Agreement: The Americas". + +For individuals and/or legal entities not resident in The Americas, the +applicable licensing terms are specified under the heading "Technology +Preview License Agreement: Rest of the World". + + +TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas +Agreement version 2.4 + +This Technology Preview License Agreement ("Agreement")is a legal agreement +between Digia USA, Inc. ("Digia"), with its registered office at 32 W. +Loockerman Street, Suite 201, City of Dover, County of Kent, Delaware 19904, +U.S.A. and you (either an individual or a legal entity) ("Licensee") for the +Licensed Software (as defined below). + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in such +entity, is able to direct its affairs and/or to control the composition +of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using the +Licensed Software which may include portions of the Licensed Software. + +"Term" shall mean the period of time six (6) months from the later of +(a) the Effective Date; or (b) the date the Licensed Software was +initially delivered to Licensee by Digia. If no specific Effective Date +is set forth in the Agreement, the Effective Date shall be deemed to be +the date the Licensed Software was initially delivered to Licensee. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Digia to Licensee in conjunction with this Agreement. + +"Party" or "Parties" shall mean Licensee and/or Digia. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +If Licensee provides any findings, proposals, suggestions or other +feedback ("Feedback") to Digia regarding the Licensed Software, Digia +shall own all right, title and interest including the intellectual +property rights in and to such Feedback, excluding however any existing +patent rights of Licensee. To the extent Licensee owns or controls any +patents for such Feedback Licensee hereby grants to Digia and its +Affiliates, a worldwide, perpetual, non-transferable, sublicensable, +royalty-free license to (i) use, copy and modify Feedback and to create +derivative works thereof, (ii) to make (and have made), use, import, +sell, offer for sale, lease, dispose, offer for disposal or otherwise +exploit any products or services of Digia containing Feedback, and +(iii) sublicense all the foregoing rights to third party licensees and +customers of Digia and/or its Affiliates. + + +3. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If Licensee +does not agree to the terms of this Agreement, Licensee may not install, +copy, or otherwise use the Licensed Software. Upon Licensee's acceptance +of the terms and conditions of this Agreement, Digia grants Licensee the +right to use the Licensed Software in the manner provided below. + + +4. LICENSES + +4.1. Using and Copying + +Digia grants to Licensee a non-exclusive, non-transferable, time-limited +license to use and copy the Licensed Software for sole purpose of +designing, developing and testing Applications, and evaluating and the +Licensed Software during the Term. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that (a) if an individual, only such +individual; or (b) if a legal entity only its employees; use the +Licensed Software for the authorized purposes. + +4.2 No Distribution or Modifications + +Licensee may not disclose, modify, sell, market, commercialise, +distribute, loan, rent, lease, or license the Licensed Software or any +copy of it or use the Licensed Software for any purpose that is not +expressly granted in this Section 4. Licensee may not alter or remove +any details of ownership, copyright, trademark or other property right +connected with the Licensed Software. Licensee may not distribute any +software statically or dynamically linked with the Licensed Software. + +4.3 No Technical Support + +Digia has no obligation to furnish Licensee with any technical support +whatsoever. Any such support is subject to separate agreement between +the Parties. + + +5. PRE-RELEASE CODE +The Licensed Software contains pre-release code that is not at the level +of performance and compatibility of a final, generally available, +product offering. The Licensed Software may not operate correctly and +may be substantially modified prior to the first commercial product +release, if any. Digia is not obligated to make this or any later +version of the Licensed Software commercially available. The License +Software is "Not for Commercial Use" and may only be used for the +purposes described in Section 4. The Licensed Software may not be used +in a live operating environment where it may be relied upon to perform +in the same manner as a commercially released product or with data that +has not been sufficiently backed up. + +6. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or code +(collectively "Third Party Software") to implement various functions. +Third Party Software does not comprise part of the Licensed Software. In +some cases, access to Third Party Software may be included along with +the Licensed Software delivery as a convenience for development and +testing only. Such source code and libraries may be listed in the +".../src/3rdparty" source tree delivered with the Licensed Software or +documented in the Licensed Software where the Third Party Software is +used, as may be amended from time to time, do not comprise the Licensed +Software. Licensee acknowledges (1) that some part of Third Party +Software may require additional licensing of copyright and patents from +the owners of such, and (2) that distribution of any of the Licensed +Software referencing any portion of a Third Party Software may require +appropriate licensing from such third parties. + + +7. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +The Licensed Software is licensed to Licensee "as is". To the maximum +extent permitted by applicable law, Digia on behalf of itself and its +suppliers, disclaims all warranties and conditions, either express or +implied, including, but not limited to, implied warranties of +merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + + +8. LIMITATION OF LIABILITY + +If, Digia's warranty disclaimer notwithstanding, Digia is held liable to +Licensee, whether in contract, tort or any other legal theory, based on +the Licensed Software, Digia's entire liability to Licensee and +Licensee's exclusive remedy shall be, at Digia's option, either (A) +return of the price Licensee paid for the Licensed Software, or (B) +repair or replacement of the Licensed Software, provided Licensee +returns to Digia all copies of the Licensed Software as originally +delivered to Licensee. Digia shall not under any circumstances be liable +to Licensee based on failure of the Licensed Software if the failure +resulted from accident, abuse or misapplication, nor shall Digia under +any circumstances be liable for special damages, punitive or exemplary +damages, damages for loss of profits or interruption of business or for +loss or corruption of data. Any award of damages from Digia to Licensee +shall not exceed the total amount Licensee has paid to Digia in +connection with this Agreement. + + +9. CONFIDENTIALITY + +Each party acknowledges that during the Term of this Agreement it shall +have access to information about the other party's business, business +methods, business plans, customers, business relations, technology, and +other information, including the terms of this Agreement, that is +confidential and of great value to the other party, and the value of +which would be significantly reduced if disclosed to third parties (the +"Confidential Information"). Accordingly, when a party (the "Receiving +Party") receives Confidential Information from another party (the +"Disclosing Party"), the Receiving Party shall, and shall obligate its +employees and agents and employees and agents of its Affiliates to: (i) +maintain the Confidential Information in strict confidence; (ii) not +disclose the Confidential Information to a third party without the +Disclosing Party's prior written approval; and (iii) not, directly or +indirectly, use the Confidential Information for any purpose other than +for exercising its rights and fulfilling its responsibilities pursuant +to this Agreement. Each party shall take reasonable measures to protect +the Confidential Information of the other party, which measures shall +not be less than the measures taken by such party to protect its own +confidential and proprietary information. + +"Confidential Information" shall not include information that (a) is or +becomes generally known to the public through no act or omission of the +Receiving Party; (b) was in the Receiving Party's lawful possession +prior to the disclosure hereunder and was not subject to limitations on +disclosure or use; (c) is developed by the Receiving Party without +access to the Confidential Information of the Disclosing Party or by +persons who have not had access to the Confidential Information of the +Disclosing Party as proven by the written records of the Receiving +Party; (d) is lawfully disclosed to the Receiving Party without +restrictions, by a third party not under an obligation of +confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall assert +the privileged and confidential nature of the information and cooperate +fully with the Disclosing Party to protect against and prevent +disclosure of any Confidential Information and to limit the scope of +disclosure and the dissemination of disclosed Confidential Information +by all legally available means. + +The obligations of the Receiving Party under this Section shall continue +during the Initial Term and for a period of five (5) years after +expiration or termination of this Agreement. To the extent that the +terms of the Non-Disclosure Agreement between Digia and Licensee +conflict with the terms of this Section 9, this Section 9 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +10. GENERAL PROVISIONS + +10.1 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the prior +written consent of Digia, which shall not be unreasonably withheld. + +10.2 Termination + +Digia may terminate the Agreement at any time immediately upon written +notice by Digia to Licensee if Licensee breaches this Agreement. + +Upon termination of this Agreement, Licensee shall return to Digia all +copies of Licensed Software that were supplied by Digia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Digia a written confirmation that this has occurred. + +10.3 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4, +10.5, 10.6, 10.7, and 10.8 of this Agreement. + +10.4 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with this +Agreement ("Non-Disclosure Agreement"), if any, shall be subject to +Section 9. No modification of this Agreement shall be effective unless +contained in a writing executed by an authorized representative of each +party. No term or condition contained in Licensee's purchase order shall +apply unless expressly accepted by Digia in writing. If any provision of +the Agreement is found void or unenforceable, the remainder shall remain +valid and enforceable according to its terms. If any remedy provided is +determined to have failed for its essential purpose, all limitations of +liability and exclusions of damages set forth in this Agreement shall +remain in effect. + +10.5 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall fully +comply with all applicable export license restrictions and requirements +as well as with all laws and regulations relating to the importation of +the Licensed Software and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software., + +10.6 Governing Law and Legal Venue + +This Agreement shall be governed by and construed in accordance with the +federal laws of the United States of America and the internal laws of +the State of New York without given effect to any choice of law rule +that would result in the application of the laws of any other +jurisdiction. The United Nations Convention on Contracts for the +International Sale of Goods (CISG) shall not apply. Each Party (a) +hereby irrevocably submits itself to and consents to the jurisdiction of +the United States District Court for the Southern District of New York +(or if such court lacks jurisdiction, the state courts of the State of +New York) for the purposes of any action, claim, suit or proceeding +between the Parties in connection with any controversy, claim, or +dispute arising out of or relating to this Agreement; and (b) hereby +waives, and agrees not to assert by way of motion, as a defense or +otherwise, in any such action, claim, suit or proceeding, any claim that +is not personally subject to the jurisdiction of such court(s), that the +action, claim, suit or proceeding is brought in an inconvenient forum or +that the venue of the action, claim, suit or proceeding is improper. +Notwithstanding the foregoing, nothing in this Section 9.6 is intended +to, or shall be deemed to, constitute a submission or consent to, or +selection of, jurisdiction, forum or venue for any action for patent +infringement, whether or not such action relates to this Agreement. + +10.7 No Implied License + +There are no implied licenses or other implied rights granted under this +Agreement, and all rights, save for those expressly granted hereunder, +shall remain with Digia and its licensors. In addition, no licenses or +immunities are granted to the combination of the Licensed Software with +any other software or hardware not delivered by Digia under this +Agreement. + +10.8 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if Licensee +is a U.S. Government End User. The Licensed Software is a "commercial +item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), +consisting of "commercial computer software" and "commercial computer +software documentation," as such terms are used in 48 C.F.R. 12.212 +(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users acquire +the Licensed Software with only those rights set forth herein. The +Licensed Software (including related documentation) is provided to U.S. +Government End Users: (a) only as a commercial end item; and (b) only +pursuant to this Agreement. + + + + + +TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World +Agreement version 2.4 + +This Technology Preview License Agreement ("Agreement") is a legal +agreement between Digia Finland Ltd ("Digia"), with its registered office at +Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a +legal entity) ("Licensee") for the Licensed Software. + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or +indirectly controlling such Party; (ii) which is under the same direct +or indirect ownership or control as such Party; or (iii) which is +directly or indirectly owned or controlled by such Party. For these +purposes, an entity shall be treated as being controlled by another if +that other entity has fifty percent (50 %) or more of the votes in such +entity, is able to direct its affairs and/or to control the composition +of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using the +Licensed Software which may include portions of the Licensed Software. + +"Term" shall mean the period of time six (6) months from the later of +(a) the Effective Date; or (b) the date the Licensed Software was +initially delivered to Licensee by Digia. If no specific Effective Date +is set forth in the Agreement, the Effective Date shall be deemed to be +the date the Licensed Software was initially delivered to Licensee. + +"Licensed Software" shall mean the computer software, "online" or +electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation +delivered by Digia to Licensee in conjunction with this Agreement. + +"Party" or "Parties" shall mean Licensee and/or Digia. + + +2. OWNERSHIP + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The Licensed Software is licensed, not sold. + +If Licensee provides any findings, proposals, suggestions or other +feedback ("Feedback") to Digia regarding the Licensed Software, Digia +shall own all right, title and interest including the intellectual +property rights in and to such Feedback, excluding however any existing +patent rights of Licensee. To the extent Licensee owns or controls any +patents for such Feedback Licensee hereby grants to Digia and its +Affiliates, a worldwide, perpetual, non-transferable, sublicensable, +royalty-free license to (i) use, copy and modify Feedback and to create +derivative works thereof, (ii) to make (and have made), use, import, +sell, offer for sale, lease, dispose, offer for disposal or otherwise +exploit any products or services of Digia containing Feedback, and +(iii) sublicense all the foregoing rights to third party licensees and +customers of Digia and/or its Affiliates. + +3. VALIDITY OF THE AGREEMENT + +By installing, copying, or otherwise using the Licensed Software, +Licensee agrees to be bound by the terms of this Agreement. If Licensee +does not agree to the terms of this Agreement, Licensee may not install, +copy, or otherwise use the Licensed Software. Upon Licensee's acceptance +of the terms and conditions of this Agreement, Digia grants Licensee the +right to use the Licensed Software in the manner provided below. + + +4. LICENSES + +4.1. Using and Copying + +Digia grants to Licensee a non-exclusive, non-transferable, time-limited +license to use and copy the Licensed Software for sole purpose of +designing, developing and testing Applications, and evaluating and the +Licensed Software during the Term. + +Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that (a) if an individual, only such +individual; or (b) if a legal entity only its employees; use the +Licensed Software for the authorized purposes. + +4.2 No Distribution or Modifications + +Licensee may not disclose, modify, sell, market, commercialise, +distribute, loan, rent, lease, or license the Licensed Software or any +copy of it or use the Licensed Software for any purpose that is not +expressly granted in this Section 4. Licensee may not alter or remove +any details of ownership, copyright, trademark or other property right +connected with the Licensed Software. Licensee may not distribute any +software statically or dynamically linked with the Licensed Software. + +4.3 No Technical Support + +Digia has no obligation to furnish Licensee with any technical support +whatsoever. Any such support is subject to separate agreement between +the Parties. + + +5. PRE-RELEASE CODE + +The Licensed Software contains pre-release code that is not at the level +of performance and compatibility of a final, generally available, +product offering. The Licensed Software may not operate correctly and +may be substantially modified prior to the first commercial product +release, if any. Digia is not obligated to make this or any later +version of the Licensed Software commercially available. The License +Software is "Not for Commercial Use" and may only be used for the +purposes described in Section 4. The Licensed Software may not be used +in a live operating environment where it may be relied upon to perform +in the same manner as a commercially released product or with data that +has not been sufficiently backed up. + +6. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or code +(collectively "Third Party Software") to implement various functions. +Third Party Software does not comprise part of the Licensed Software. In +some cases, access to Third Party Software may be included along with +the Licensed Software delivery as a convenience for development and +testing only. Such source code and libraries may be listed in the +".../src/3rdparty" source tree delivered with the Licensed Software or +documented in the Licensed Software where the Third Party Software is +used, as may be amended from time to time, do not comprise the Licensed +Software. Licensee acknowledges (1) that some part of Third Party +Software may require additional licensing of copyright and patents from +the owners of such, and (2) that distribution of any of the Licensed +Software referencing any portion of a Third Party Software may require +appropriate licensing from such third parties. + + +7. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +The Licensed Software is licensed to Licensee "as is". To the maximum +extent permitted by applicable law, Digia on behalf of itself and its +suppliers, disclaims all warranties and conditions, either express or +implied, including, but not limited to, implied warranties of +merchantability, fitness for a particular purpose, title and +non-infringement with regard to the Licensed Software. + + +8. LIMITATION OF LIABILITY + +If, Digia's warranty disclaimer notwithstanding, Digia is held liable to +Licensee, whether in contract, tort or any other legal theory, based on +the Licensed Software, Digia's entire liability to Licensee and +Licensee's exclusive remedy shall be, at Digia's option, either (A) +return of the price Licensee paid for the Licensed Software, or (B) +repair or replacement of the Licensed Software, provided Licensee +returns to Digia all copies of the Licensed Software as originally +delivered to Licensee. Digia shall not under any circumstances be liable +to Licensee based on failure of the Licensed Software if the failure +resulted from accident, abuse or misapplication, nor shall Digia under +any circumstances be liable for special damages, punitive or exemplary +damages, damages for loss of profits or interruption of business or for +loss or corruption of data. Any award of damages from Digia to Licensee +shall not exceed the total amount Licensee has paid to Digia in +connection with this Agreement. + + +9. CONFIDENTIALITY + +Each party acknowledges that during the Term of this Agreement it shall +have access to information about the other party's business, business +methods, business plans, customers, business relations, technology, and +other information, including the terms of this Agreement, that is +confidential and of great value to the other party, and the value of +which would be significantly reduced if disclosed to third parties (the +"Confidential Information"). Accordingly, when a party (the "Receiving +Party") receives Confidential Information from another party (the +"Disclosing Party"), the Receiving Party shall, and shall obligate its +employees and agents and employees and agents of its Affiliates to: (i) +maintain the Confidential Information in strict confidence; (ii) not +disclose the Confidential Information to a third party without the +Disclosing Party's prior written approval; and (iii) not, directly or +indirectly, use the Confidential Information for any purpose other than +for exercising its rights and fulfilling its responsibilities pursuant +to this Agreement. Each party shall take reasonable measures to protect +the Confidential Information of the other party, which measures shall +not be less than the measures taken by such party to protect its own +confidential and proprietary information. + +"Confidential Information" shall not include information that (a) is or +becomes generally known to the public through no act or omission of the +Receiving Party; (b) was in the Receiving Party's lawful possession +prior to the disclosure hereunder and was not subject to limitations on +disclosure or use; (c) is developed by the Receiving Party without +access to the Confidential Information of the Disclosing Party or by +persons who have not had access to the Confidential Information of the +Disclosing Party as proven by the written records of the Receiving +Party; (d) is lawfully disclosed to the Receiving Party without +restrictions, by a third party not under an obligation of +confidentiality; or (e) the Receiving Party is legally compelled to +disclose the information, in which case the Receiving Party shall assert +the privileged and confidential nature of the information and cooperate +fully with the Disclosing Party to protect against and prevent +disclosure of any Confidential Information and to limit the scope of +disclosure and the dissemination of disclosed Confidential Information +by all legally available means. + +The obligations of the Receiving Party under this Section shall continue +during the Initial Term and for a period of five (5) years after +expiration or termination of this Agreement. To the extent that the +terms of the Non-Disclosure Agreement between Digia and Licensee +conflict with the terms of this Section 9, this Section 9 shall be +controlling over the terms of the Non-Disclosure Agreement. + + +10. GENERAL PROVISIONS + +10.1 No Assignment + +Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the prior +written consent of Digia, which shall not be unreasonably withheld. + +10.2 Termination + +Digia may terminate the Agreement at any time immediately upon written +notice by Digia to Licensee if Licensee breaches this Agreement. + +Upon termination of this Agreement, Licensee shall return to Digia all +copies of Licensed Software that were supplied by Digia. All other +copies of Licensed Software in the possession or control of Licensee +must be erased or destroyed. An officer of Licensee must promptly +deliver to Digia a written confirmation that this has occurred. + +10.3 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably +should survive a cancellation or termination of this Agreement shall +also be deemed to survive. Such terms and conditions include, but are +not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4, +10.5, 10.6, 10.7, and 10.8 of this Agreement. + +10.4 Entire Agreement + +This Agreement constitutes the complete agreement between the parties +and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the +subject matters discussed herein, with the exception of the +non-disclosure agreement executed by the parties in connection with this +Agreement ("Non-Disclosure Agreement"), if any, shall be subject to +Section 9. No modification of this Agreement shall be effective unless +contained in a writing executed by an authorized representative of each +party. No term or condition contained in Licensee's purchase order shall +apply unless expressly accepted by Digia in writing. If any provision of +the Agreement is found void or unenforceable, the remainder shall remain +valid and enforceable according to its terms. If any remedy provided is +determined to have failed for its essential purpose, all limitations of +liability and exclusions of damages set forth in this Agreement shall +remain in effect. + +10.5 Export Control + +Licensee acknowledges that the Licensed Software may be subject to +export control restrictions of various countries. Licensee shall fully +comply with all applicable export license restrictions and requirements +as well as with all laws and regulations relating to the importation of +the Licensed Software and shall procure all necessary governmental +authorizations, including without limitation, all necessary licenses, +approvals, permissions or consents, where necessary for the +re-exportation of the Licensed Software., + +10.6 Governing Law and Legal Venue + +This Agreement shall be construed and interpreted in accordance with the +laws of Finland, excluding its choice of law provisions. Any disputes +arising out of or relating to this Agreement shall be resolved in +arbitration under the Rules of Arbitration of the Chamber of Commerce of +Helsinki, Finland. The arbitration tribunal shall consist of one (1), or +if either Party so requires, of three (3), arbitrators. The award shall +be final and binding and enforceable in any court of competent +jurisdiction. The arbitration shall be held in Helsinki, Finland and the +process shall be conducted in the English language. + +10.7 No Implied License + +There are no implied licenses or other implied rights granted under this +Agreement, and all rights, save for those expressly granted hereunder, +shall remain with Digia and its licensors. In addition, no licenses or +immunities are granted to the combination of the Licensed Software with +any other software or hardware not delivered by Digia under this +Agreement. + +10.8 Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the +government of the United States. The following shall apply if Licensee +is a U.S. Government End User. The Licensed Software is a "commercial +item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), +consisting of "commercial computer software" and "commercial computer +software documentation," as such terms are used in 48 C.F.R. 12.212 +(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users acquire +the Licensed Software with only those rights set forth herein. The +Licensed Software (including related documentation) is provided to U.S. +Government End Users: (a) only as a commercial end item; and (b) only +pursuant to this Agreement. + + + + From a11c7ef6709a97ea1352d2f3c10512da31700a2e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 31 May 2013 14:07:22 +0300 Subject: [PATCH 29/42] Updated submodules. Change-Id: Iad91faa3bdb0faa8c2d5b23b00addaf6af01989d Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtjsbackend | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebkit | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 89f219da..9e367477 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 89f219da0c720c326c4c3aa696141e368832ee43 +Subproject commit 9e36747786b31c9494f99af5e1f7c977b51b7ce7 diff --git a/qtdeclarative b/qtdeclarative index 3414cc6c..e840b9e2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3414cc6c7a4e021ec2c9a4f369acc2a0a0568c58 +Subproject commit e840b9e2c56a786ef7c4232b8fb2f1df1b285da4 diff --git a/qtdoc b/qtdoc index 3e627574..81c5d005 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3e627574e97ead8e8f8a18bd9a940974515a2ceb +Subproject commit 81c5d0053e0c1bebbfd45a46d44c744e4576b543 diff --git a/qtjsbackend b/qtjsbackend index 30a8abf6..7d469e82 160000 --- a/qtjsbackend +++ b/qtjsbackend @@ -1 +1 @@ -Subproject commit 30a8abf65e8fd08baaa972fb79af060043895215 +Subproject commit 7d469e82e274d334c7d03d81b10d225c59d30798 diff --git a/qtqa b/qtqa index 59e85d63..f7538a0a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 59e85d6397fb51bbd6547a7a6ce1895fb93f62cb +Subproject commit f7538a0af725f9c68c6f99888bf336a207c6ba2d diff --git a/qtquickcontrols b/qtquickcontrols index 10851004..0155e083 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 10851004e327f4ab798753c645ab987f10160100 +Subproject commit 0155e0833c56ccd21ca5668eb1be8b359400535b diff --git a/qttools b/qttools index cdc45628..92092740 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit cdc456281617cffc12e6f406d8e2c7fcf7e97144 +Subproject commit 92092740ab545b2cd718ef2990687a92c428f44d diff --git a/qtwebkit b/qtwebkit index fb2adc6d..ac00a345 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit fb2adc6de925b6045575e4cf3651356ce8f41814 +Subproject commit ac00a345b23686aa458539dde0cb3711bed84de3 From 641bab7bdec259a9aed5be4d5f643828254e1ac4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Jun 2013 06:32:37 +0300 Subject: [PATCH 30/42] Updated submodules. Change-Id: Ia11c7ef6709a97ea1352d2f3c10512da31700a2e Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qttranslations | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 9e367477..fb7e0e24 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9e36747786b31c9494f99af5e1f7c977b51b7ce7 +Subproject commit fb7e0e24c4181e9e97d85a3a80c3e2ef5a40770a diff --git a/qtdeclarative b/qtdeclarative index e840b9e2..6bee1647 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e840b9e2c56a786ef7c4232b8fb2f1df1b285da4 +Subproject commit 6bee16477ab75acdb458d2f9c50f97cdc76e07b9 diff --git a/qtdoc b/qtdoc index 81c5d005..cb15f6b4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81c5d0053e0c1bebbfd45a46d44c744e4576b543 +Subproject commit cb15f6b4570d27f3c7c64efe28fc5beda884361a diff --git a/qtmultimedia b/qtmultimedia index 3196d386..2998a24d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3196d3869eb564565e875929af6a913de5c30c53 +Subproject commit 2998a24d35a38e0b651b6e8efe07a1890ff2b6aa diff --git a/qtquickcontrols b/qtquickcontrols index 0155e083..eeb3c959 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0155e0833c56ccd21ca5668eb1be8b359400535b +Subproject commit eeb3c959334d1e6b4ea9f7538b603a711f8a8262 diff --git a/qttranslations b/qttranslations index 248c4c86..2277b88d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 248c4c86f8d7b06234761286d5d600fa2721eed8 +Subproject commit 2277b88d466b5bcfdd9171dfc987af42ffe9d4d7 From cfdf021c18de12f80907bbd366ae1e03a362c61c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Jun 2013 14:32:38 +0300 Subject: [PATCH 31/42] Updated submodules. Change-Id: I641bab7bdec259a9aed5be4d5f643828254e1ac4 Reviewed-by: Iikka Eklund --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index fb7e0e24..07337def 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fb7e0e24c4181e9e97d85a3a80c3e2ef5a40770a +Subproject commit 07337def652a13002ccc98d77bb1a13372bba26f diff --git a/qtdeclarative b/qtdeclarative index 6bee1647..65a9318f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6bee16477ab75acdb458d2f9c50f97cdc76e07b9 +Subproject commit 65a9318f8fbfe6e3c1f33675fea435a76b869870 diff --git a/qtdoc b/qtdoc index cb15f6b4..726a593f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cb15f6b4570d27f3c7c64efe28fc5beda884361a +Subproject commit 726a593fb6a8e8aa642e92684ed4ef3032702ade diff --git a/qtimageformats b/qtimageformats index aa3c1a3b..37257d4b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit aa3c1a3b51f0f89afd83ffd62d38765489c40d06 +Subproject commit 37257d4be0cab8d5a92db9566f89ac115645f81f diff --git a/qtmultimedia b/qtmultimedia index 2998a24d..fca12620 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2998a24d35a38e0b651b6e8efe07a1890ff2b6aa +Subproject commit fca12620b1e14a5d2daf467f2f8c6eb96714e80a diff --git a/qtquickcontrols b/qtquickcontrols index eeb3c959..fef62c9b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit eeb3c959334d1e6b4ea9f7538b603a711f8a8262 +Subproject commit fef62c9b40ff1d79e62778e67c90f956da84b238 diff --git a/qtwebkit b/qtwebkit index ac00a345..0376f732 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit ac00a345b23686aa458539dde0cb3711bed84de3 +Subproject commit 0376f73239d78abcd99fcb2dec82e8d1b5132296 diff --git a/qtwebkit-examples b/qtwebkit-examples index 40533fc2..bb4c9761 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 40533fc252c88b18dab9124d3805d70bde0ecb5d +Subproject commit bb4c9761d2746fa26c67ed07821fdb38bb0a3c9b From 7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Jun 2013 22:32:34 +0300 Subject: [PATCH 32/42] Updated submodules. Change-Id: Icfdf021c18de12f80907bbd366ae1e03a362c61c Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtwebkit | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 07337def..04830dbc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 07337def652a13002ccc98d77bb1a13372bba26f +Subproject commit 04830dbcb2c1b92bd949ac7fd56d293b02e91fef diff --git a/qtdeclarative b/qtdeclarative index 65a9318f..cfd4bf9d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 65a9318f8fbfe6e3c1f33675fea435a76b869870 +Subproject commit cfd4bf9d6cb8a932eab5ac99bae8973b9cedc803 diff --git a/qtdoc b/qtdoc index 726a593f..c83409eb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 726a593fb6a8e8aa642e92684ed4ef3032702ade +Subproject commit c83409eb534133af994b84a2b56ce5989c7252bd diff --git a/qtquickcontrols b/qtquickcontrols index fef62c9b..e67d67d0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fef62c9b40ff1d79e62778e67c90f956da84b238 +Subproject commit e67d67d0ad0c5c4549047f13be1999c65a9efb42 diff --git a/qtrepotools b/qtrepotools index 123615b1..d34b8da0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 123615b189ff759c9e534db7705dce856c160609 +Subproject commit d34b8da0f079456d8734d2303ee86e96993c6b47 diff --git a/qtsensors b/qtsensors index 4dca8393..4a96b1e9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4dca8393f1ea472cd9cc9b70bf2c6617c6e6355f +Subproject commit 4a96b1e9ac7bfdf3409ce27db2e58db89222ef22 diff --git a/qtserialport b/qtserialport index f3015913..2bcac223 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f30159132c2c486508d227fc7d5615e032df6f68 +Subproject commit 2bcac223e64599eb74889975053f6547000b13cb diff --git a/qtwebkit b/qtwebkit index 0376f732..b3b8ed03 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 0376f73239d78abcd99fcb2dec82e8d1b5132296 +Subproject commit b3b8ed036fb802f638cac9c637065363fba8b4fa From f1d7bdd44443aaf5b60a61667d84adf6df98aaf5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 7 Jun 2013 22:32:40 +0300 Subject: [PATCH 33/42] Updated submodules. Change-Id: I7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 04830dbc..9ef24ff8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 04830dbcb2c1b92bd949ac7fd56d293b02e91fef +Subproject commit 9ef24ff8ed487d49cf441c65c69ea7ebfe8acfb3 diff --git a/qtdeclarative b/qtdeclarative index cfd4bf9d..837b76fa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cfd4bf9d6cb8a932eab5ac99bae8973b9cedc803 +Subproject commit 837b76fa4dd4a904e0c29f93fca5de1d642a84e3 diff --git a/qtquickcontrols b/qtquickcontrols index e67d67d0..39ed137e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e67d67d0ad0c5c4549047f13be1999c65a9efb42 +Subproject commit 39ed137e71326411083c27c1d132769c33200df4 diff --git a/qtserialport b/qtserialport index 2bcac223..58365228 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2bcac223e64599eb74889975053f6547000b13cb +Subproject commit 58365228b3181ed03188fc8ff56007ea22678bb5 From 6a19225d751896cb5748cd20084a93bc62340cb8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 9 Jun 2013 06:32:41 +0300 Subject: [PATCH 34/42] Updated submodules. Change-Id: If1d7bdd44443aaf5b60a61667d84adf6df98aaf5 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 9ef24ff8..ebea15cb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9ef24ff8ed487d49cf441c65c69ea7ebfe8acfb3 +Subproject commit ebea15cb33da8063a630867e38eacf7857b0b936 diff --git a/qtdeclarative b/qtdeclarative index 837b76fa..e4fc75ed 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 837b76fa4dd4a904e0c29f93fca5de1d642a84e3 +Subproject commit e4fc75edaedead3092aace3a29a0aafdd0e86a77 From 3918311aeb73f39e267beb8dd377c5822ae93536 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Jun 2013 06:32:51 +0300 Subject: [PATCH 35/42] Updated submodules. Change-Id: I6a19225d751896cb5748cd20084a93bc62340cb8 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qttranslations | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index ebea15cb..425af59f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ebea15cb33da8063a630867e38eacf7857b0b936 +Subproject commit 425af59f534ed8a0f4bc7a77a1f83e4d1e2e2bdc diff --git a/qtdeclarative b/qtdeclarative index e4fc75ed..f64704fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e4fc75edaedead3092aace3a29a0aafdd0e86a77 +Subproject commit f64704fed878f74b9525304329cbabb94511090f diff --git a/qtdoc b/qtdoc index c83409eb..cd4b4157 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c83409eb534133af994b84a2b56ce5989c7252bd +Subproject commit cd4b41575da72b2f55ba51e79b7b4d08c2bf9269 diff --git a/qtquick1 b/qtquick1 index dfe77c25..c558d84e 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit dfe77c25412eedcfecfd738904c2714c53d1e3bb +Subproject commit c558d84e79a7c7553bf182c8f298fb57826bf9af diff --git a/qtquickcontrols b/qtquickcontrols index 39ed137e..5303f814 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 39ed137e71326411083c27c1d132769c33200df4 +Subproject commit 5303f814746606a78198fec5c02746c2f3090460 diff --git a/qttranslations b/qttranslations index 2277b88d..4851d42d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2277b88d466b5bcfdd9171dfc987af42ffe9d4d7 +Subproject commit 4851d42d98e7be3d0a6bff82e278e2dbf32e4f10 From 111d8165f6f30a93014fa8a5d34d0171df3eb286 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 12 Jun 2013 22:32:46 +0300 Subject: [PATCH 36/42] Updated submodules. Change-Id: I3918311aeb73f39e267beb8dd377c5822ae93536 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebkit | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 425af59f..443253cf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 425af59f534ed8a0f4bc7a77a1f83e4d1e2e2bdc +Subproject commit 443253cf1191c5157f4a5338a6fc45993ea86061 diff --git a/qtdeclarative b/qtdeclarative index f64704fe..278139c5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f64704fed878f74b9525304329cbabb94511090f +Subproject commit 278139c5d7bfa338ff75c5225077976ece7490e0 diff --git a/qtdoc b/qtdoc index cd4b4157..fb883969 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cd4b41575da72b2f55ba51e79b7b4d08c2bf9269 +Subproject commit fb8839690418d3af30536b297b58db94517f2b17 diff --git a/qtquickcontrols b/qtquickcontrols index 5303f814..3b10c17e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5303f814746606a78198fec5c02746c2f3090460 +Subproject commit 3b10c17e34bd6da6278600f57a0ecafe5eb58431 diff --git a/qttools b/qttools index 92092740..8da32f8b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 92092740ab545b2cd718ef2990687a92c428f44d +Subproject commit 8da32f8b6470b7d7d03ed18821e600bd2fe1f6e2 diff --git a/qtwebkit b/qtwebkit index b3b8ed03..1810e384 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit b3b8ed036fb802f638cac9c637065363fba8b4fa +Subproject commit 1810e3848d15ffbe9529f53866fc0ede8d947fef From 80d90b4862303451538f68ffb68e4a21474e535f Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 14 Jun 2013 19:45:20 +0200 Subject: [PATCH 37/42] Updated submodules. Change-Id: If458a1b0946562ac8fea9f863a09862bba15527c Reviewed-by: Jani Heikkinen Reviewed-by: Sergio Ahumada --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 443253cf..3e2cd8ef 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 443253cf1191c5157f4a5338a6fc45993ea86061 +Subproject commit 3e2cd8ef6f1ce4f46719890134c8bba9dbdb19ba From 35350e9779e2cc0507d1e1dd749ce2d22d011205 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 16 Jun 2013 14:32:37 +0300 Subject: [PATCH 38/42] Updated submodules. Change-Id: I111d8165f6f30a93014fa8a5d34d0171df3eb286 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebkit | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 3e2cd8ef..d135a311 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e2cd8ef6f1ce4f46719890134c8bba9dbdb19ba +Subproject commit d135a311a34e693d761a3607663b0879be9bbf65 diff --git a/qtdeclarative b/qtdeclarative index 278139c5..9f661cf3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 278139c5d7bfa338ff75c5225077976ece7490e0 +Subproject commit 9f661cf327bc638d7584ba3832adaaa3d7c8734e diff --git a/qtdoc b/qtdoc index fb883969..178d13c0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fb8839690418d3af30536b297b58db94517f2b17 +Subproject commit 178d13c0d68bc2d77f9f71b6c98d19b97907ce92 diff --git a/qtmultimedia b/qtmultimedia index fca12620..16a775d4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fca12620b1e14a5d2daf467f2f8c6eb96714e80a +Subproject commit 16a775d47a69913ce4f0306531c97469066ea896 diff --git a/qtquickcontrols b/qtquickcontrols index 3b10c17e..03c7e64e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3b10c17e34bd6da6278600f57a0ecafe5eb58431 +Subproject commit 03c7e64ef5f3dfd10d61fd2473fb9f09b124c6e6 diff --git a/qtrepotools b/qtrepotools index d34b8da0..826e7361 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d34b8da0f079456d8734d2303ee86e96993c6b47 +Subproject commit 826e736176ff0c8a5f5b8cb3de6bb1b185fdd27e diff --git a/qttools b/qttools index 8da32f8b..9631fd4e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8da32f8b6470b7d7d03ed18821e600bd2fe1f6e2 +Subproject commit 9631fd4eec392fbf4d6a0c5da18db2165b15abcb diff --git a/qttranslations b/qttranslations index 4851d42d..eb8ee6a9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4851d42d98e7be3d0a6bff82e278e2dbf32e4f10 +Subproject commit eb8ee6a96b8a3dd4228c746c617dd36b66e70dec diff --git a/qtwebkit b/qtwebkit index 1810e384..0368bb7e 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 1810e3848d15ffbe9529f53866fc0ede8d947fef +Subproject commit 0368bb7e2682d0b187d31bb91618632965351e4d From 7661124ff12d211f9613bb31e9fd170b0bceb477 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 12 Jun 2013 15:54:06 +0200 Subject: [PATCH 39/42] Update LICENSE.PREVIEW.COMMERCIAL license Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769 Reviewed-by: Akseli Salovaara Reviewed-by: Iikka Eklund --- LICENSE.PREVIEW.COMMERCIAL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL index e90ad1ac..15e61fc1 100644 --- a/LICENSE.PREVIEW.COMMERCIAL +++ b/LICENSE.PREVIEW.COMMERCIAL @@ -14,8 +14,8 @@ TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas Agreement version 2.4 This Technology Preview License Agreement ("Agreement")is a legal agreement -between Digia USA, Inc. ("Digia"), with its registered office at 32 W. -Loockerman Street, Suite 201, City of Dover, County of Kent, Delaware 19904, +between Digia USA, Inc. ("Digia"), with its registered office at 2350 +Mission College Blvd., Suite 1020, Santa Clara, California 95054, U.S.A. and you (either an individual or a legal entity) ("Licensee") for the Licensed Software (as defined below). From 375328584b6361cd9f364be05b29afa5f33ac318 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 17 Jun 2013 17:24:28 +0300 Subject: [PATCH 40/42] Updated submodules. Change-Id: I35350e9779e2cc0507d1e1dd749ce2d22d011205 Reviewed-by: Sergio Ahumada --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index d135a311..a5ecb0bc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d135a311a34e693d761a3607663b0879be9bbf65 +Subproject commit a5ecb0bcfd0295723ef6c58136397b9455ec482c diff --git a/qtdoc b/qtdoc index 178d13c0..99ad0e4b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 178d13c0d68bc2d77f9f71b6c98d19b97907ce92 +Subproject commit 99ad0e4b7062f0dcefcfe5ccb809554fd01e257b diff --git a/qtqa b/qtqa index f7538a0a..740278e0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f7538a0af725f9c68c6f99888bf336a207c6ba2d +Subproject commit 740278e0ae7c630d6a7e2aa5f0dbcbfac00a42b3 diff --git a/qtquickcontrols b/qtquickcontrols index 03c7e64e..64f464d7 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 03c7e64ef5f3dfd10d61fd2473fb9f09b124c6e6 +Subproject commit 64f464d7641384a98f894430a7e8b71a182aaaf7 From 23a639d4cc4d7e3c3b598ad70e0d1be1463ac96a Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 17 Jun 2013 13:18:59 +0200 Subject: [PATCH 41/42] Don't include README.git in source packages It doesn't make sense for non-git content anyways. Change-Id: I9064de54657ab50caa526dab2830ee0d16054a9e Reviewed-by: Oswald Buddenhagen Reviewed-by: Iikka Eklund --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 7db26d8d..df15048e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ .gitmodules export-ignore .commit-template export-ignore init-repository export-ignore +README.git export-ignore From 8c2518eea421de365db4733af9e6faf09a173634 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 18 Jun 2013 17:10:00 +0200 Subject: [PATCH 42/42] rewrite top-level configures without perl otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would be fairly useless for top-level builds. Task-number: QTBUG-31786 Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0 Reviewed-by: Tuukka Turunen Reviewed-by: Joerg Bornemann Reviewed-by: Lars Knoll --- configure | 70 ++++++++++++--------------------------------------- configure.bat | 30 ++++++++++++++++++++-- 2 files changed, 44 insertions(+), 56 deletions(-) diff --git a/configure b/configure index 221d63f7..746e5920 100755 --- a/configure +++ b/configure @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#! /bin/sh ############################################################################# ## ## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -40,61 +40,23 @@ ## ############################################################################# -#################################################################################################### -# -# Mother script for Qt Modularization -# -#################################################################################################### +srcpath=`dirname $0` +configure=$srcpath/qtbase/configure +if [ ! -e "$configure" ]; then + echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 + exit 1 +fi -use strict; -use warnings; +mkdir -p qtbase || exit -use File::Basename; -use File::Path; -use Cwd; -use Cwd 'abs_path'; -use Config; +echo "+ cd qtbase" +cd qtbase || exit -# Makes sure the arguments are directories, and creates them if not. -# Will die if there is an error. -sub ensureDir { - foreach (@_) { - if (-e $_) { - if (-d $_) { - next; - } else { - die ("$_ exists, but is not a directory"); - } - } - File::Path::mkpath($_) or die("Could not create $_"); - } -} +echo "+ $configure $@" +"$configure" "$@" || exit 1 -# `system', but also print the command -sub system_v -{ - print "+ @_\n"; - return system(@_); -} +echo "+ cd .." +cd .. -my $relpath = dirname(abs_path($0)); -$relpath =~ s,\\,/,g; -# the current directory is the "build tree" or "object tree" -my $outpath = getcwd(); - -if (! -e "$relpath/qtbase/configure") { - die("$relpath/qtbase/configure not found. Did you forget to run \"init-repository\"?"); -} - -ensureDir("$outpath/qtbase"); -chdir("$outpath/qtbase"); -my $ret = system_v("$relpath/qtbase/configure", @ARGV); -if ($ret != 0) { - print "*** qtbase/configure exited with non-zero status.\n"; - exit ($ret>>8) ; -} - -chdir("$outpath"); - -$ret = system_v("$outpath/qtbase/bin/qmake", "$relpath/qt.pro"); -exit ($ret>>8); +echo "+ qtbase/bin/qmake $srcpath" +exec qtbase/bin/qmake "$srcpath" diff --git a/configure.bat b/configure.bat index 399dd339..73395684 100644 --- a/configure.bat +++ b/configure.bat @@ -1,3 +1,4 @@ +@echo off ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). @@ -38,5 +39,30 @@ :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@rem ***** This assumes PERL is in the PATH ***** -@perl.exe %~dp0configure %* + +set "srcpath=%~dp0" +set "configure=%srcpath%qtbase\configure.bat" +if not exist "%configure%" ( + echo %configure% not found. Did you forget to run "init-repository"? >&2 + exit /b 1 +) + +if not exist qtbase mkdir qtbase || exit /b 1 + +echo + cd qtbase +cd qtbase || exit /b 1 + +echo + %configure% %* +call %configure% %* +set err=%errorlevel% + +cd .. + +if not %err% == 0 goto out + +echo + qtbase\bin\qmake %srcpath% +qtbase\bin\qmake %srcpath% +set err=%errorlevel% + +:out +exit /b %err%