From 290b0e216833adb30e55f62a4448727920104992 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 15 Mar 2013 11:44:39 +0100 Subject: Fix generation of documentation on windows Change-Id: Ie7639a9c4dbf1fc972f5e5020042234de016b65f Reviewed-by: Karsten Heimrich --- doc/doc.pri | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/doc/doc.pri b/doc/doc.pri index 8c3a9f208..a460b3b3a 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -9,11 +9,16 @@ win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") IFW_VERSION_TAG = $$replace(IFW_VERSION, "[-.]", ) +defineReplace(cmdEnv) { + !equals(QMAKE_DIR_SEP, /): 1 ~= s,^(.*)$,(set \\1) &&,g + return("$$1") +} + +QDOC = $$cmdEnv(SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html IFW_VERSION=$$IFW_VERSION IFW_VERSION_TAG=$$IFW_VERSION_TAG QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS]) $$QDOC_BIN + unix { - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html IFW_VERSION=$$IFW_VERSION IFW_VERSION_TAG=$$IFW_VERSION_TAG $$QDOC_BIN HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator } else { - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set IFW_VERSION=$$IFW_VERSION&& setIFW_VERSION_TAG=$$IFW_VERSION_TAG&& $$QDOC_BIN # Always run qhelpgenerator inside its own cmd; this is a workaround for # an unusual bug which causes qhelpgenerator.exe to do nothing HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") @@ -47,19 +52,11 @@ HELP_DEP_FILES = $$PWD/installerfw.qdoc \ $$PWD/config/qt-html-templates-online.qdocconf \ $$PWD/config/qt-html-templates.qdocconf -unix { html_docs.commands = $$QDOC $$PWD/installerfw.qdocconf -} else { -html_docs.commands = \"$$QDOC $$PWD/installerfw.qdocconf\" -} html_docs.depends += $$HELP_DEP_FILES html_docs.files = $$QHP_FILE -unix { html_docs_online.commands = $$QDOC $$PWD/installerfw-online.qdocconf -} else { -html_docs_online.commands = \"$$QDOC $$PWD/installerfw-online.qdocconf\" -} html_docs_online.depends += $$HELP_DEP_FILES html_docs_online.files = $$QHP_FILE -- cgit v1.2.3 From a93cc28baba4832f63ef24d3d8fe5b534face441 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 12 Mar 2013 16:33:35 +0100 Subject: Add Installer Configuration for IFW Change-Id: I137abbe87e1fc2e4de83e509a17d5712b6c59f81 Reviewed-by: Tim Jenssen --- dist/README | 1 + dist/config/config.xml | 13 + dist/config/watermark.png | Bin 0 -> 12983 bytes .../org.qtproject.ifw.binaries/meta/package.xml | 8 + .../org.qtproject.ifw/meta/LGPL_EXCEPTION.txt | 22 + dist/packages/org.qtproject.ifw/meta/LICENSE.LGPL | 504 +++++++++++++++++++++ .../org.qtproject.ifw/meta/installscript.qs | 12 + dist/packages/org.qtproject.ifw/meta/package.xml | 12 + 8 files changed, 572 insertions(+) create mode 100644 dist/README create mode 100644 dist/config/config.xml create mode 100644 dist/config/watermark.png create mode 100644 dist/packages/org.qtproject.ifw.binaries/meta/package.xml create mode 100644 dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt create mode 100644 dist/packages/org.qtproject.ifw/meta/LICENSE.LGPL create mode 100644 dist/packages/org.qtproject.ifw/meta/installscript.qs create mode 100644 dist/packages/org.qtproject.ifw/meta/package.xml diff --git a/dist/README b/dist/README new file mode 100644 index 000000000..35e9da886 --- /dev/null +++ b/dist/README @@ -0,0 +1 @@ +Contains the configuration for the installer of the Qt Installer Framework. diff --git a/dist/config/config.xml b/dist/config/config.xml new file mode 100644 index 000000000..e2b408e2a --- /dev/null +++ b/dist/config/config.xml @@ -0,0 +1,13 @@ + + + Qt Installer Framework + Qt Installer Framework 1.3.0 + 1.0.0 + Qt Project + http://qt-project.org + watermark.png + Uninstaller + + + @homeDir@/Qt/QtIFW-1.3.0 + diff --git a/dist/config/watermark.png b/dist/config/watermark.png new file mode 100644 index 000000000..fc44c44f4 Binary files /dev/null and b/dist/config/watermark.png differ diff --git a/dist/packages/org.qtproject.ifw.binaries/meta/package.xml b/dist/packages/org.qtproject.ifw.binaries/meta/package.xml new file mode 100644 index 000000000..edfb30e7f --- /dev/null +++ b/dist/packages/org.qtproject.ifw.binaries/meta/package.xml @@ -0,0 +1,8 @@ + + + Qt Installer Framework Binaries + Installs the binaries, examples and help files. + 1.3.0 + 2013-03-21 + True + diff --git a/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt b/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt new file mode 100644 index 000000000..add80b931 --- /dev/null +++ b/dist/packages/org.qtproject.ifw/meta/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/dist/packages/org.qtproject.ifw/meta/LICENSE.LGPL b/dist/packages/org.qtproject.ifw/meta/LICENSE.LGPL new file mode 100644 index 000000000..602bfc946 --- /dev/null +++ b/dist/packages/org.qtproject.ifw/meta/LICENSE.LGPL @@ -0,0 +1,504 @@ + 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/dist/packages/org.qtproject.ifw/meta/installscript.qs b/dist/packages/org.qtproject.ifw/meta/installscript.qs new file mode 100644 index 000000000..0019255e1 --- /dev/null +++ b/dist/packages/org.qtproject.ifw/meta/installscript.qs @@ -0,0 +1,12 @@ +function Component() +{ + // Install to @rootDir@ instead of @homeDir@ on Windows + if (installer.value("os") === "win") { + var homeDir = installer.value("homeDir"); + var targetDir = installer.value("TargetDir").replace(homeDir, "@rootDir@"); + installer.setValue("TargetDir", targetDir); + } + + // do not show component selection page + installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); +} diff --git a/dist/packages/org.qtproject.ifw/meta/package.xml b/dist/packages/org.qtproject.ifw/meta/package.xml new file mode 100644 index 000000000..8f3e0e814 --- /dev/null +++ b/dist/packages/org.qtproject.ifw/meta/package.xml @@ -0,0 +1,12 @@ + + + Qt Installer Framework + Installs the Qt Installer Framework. + 1.3.0 + 2013-03-21 + + + + + + -- cgit v1.2.3 From 73ecaccd4556acf3fd07feb522a42c9f5710d7ab Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 14 Mar 2013 20:35:29 +0100 Subject: Add script to build the ifw installer Change-Id: Ia8e02760ed4288557d51472891b5e9750d960366 Reviewed-by: Tim Jenssen --- tools/build_installer.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 tools/build_installer.py diff --git a/tools/build_installer.py b/tools/build_installer.py new file mode 100644 index 000000000..1152d92e4 --- /dev/null +++ b/tools/build_installer.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python + +import argparse +import os +import shutil +import string +import subprocess +import sys + +args = {} + +src_dir = '' +build_dir = '' +package_dir = '' +archive_file = '' +target_path = '' + +def parse_arguments(): + global args + + parser = argparse.ArgumentParser(description='Build installer for installer framework.') + parser.add_argument('--clean', dest='clean', action='store_true', help='delete all previous build artifacts') + parser.add_argument('--static-qmake', dest='qmake', required=True, help='path to qmake that will be used to build the tools') + parser.add_argument('--doc-qmake', dest='doc_qmake', required=True, help='path to qmake that will be used to generate the documentation') + parser.add_argument('--make', dest='make', required=True, help='make command') + + args = parser.parse_args() + +def run(args): + print 'calling ' + string.join(args) + subprocess.check_call(args) + +def init(): + global src_dir + global build_dir + global package_dir + global target_path + + src_dir = os.path.dirname(os.path.abspath(os.path.dirname(sys.argv[0]))) + root_dir = os.path.dirname(src_dir) + basename = os.path.basename(src_dir) + build_dir = os.path.join(root_dir, basename + '_build') + package_dir = os.path.join(root_dir, basename + '_pkg') + target_path = os.path.join(root_dir, 'ifw') + + print 'source dir: ' + src_dir + print 'build dir: ' + build_dir + print 'package dir: ' + package_dir + print 'target path: ' + target_path + + if args.clean and os.path.exists(build_dir): + print 'delete existing build dir ...' + shutil.rmtree(build_dir) + if not os.path.exists(build_dir): + os.makedirs(build_dir) + + if os.path.exists(package_dir): + print 'delete existing package dir ...' + shutil.rmtree(package_dir) + os.makedirs(package_dir) + +def build_docs(): + print 'building documentation ...' + os.chdir(build_dir) + run((args.doc_qmake, src_dir)) + run((args.make, 'docs')) + print 'success!' + +def build(): + print 'building sources ...' + os.chdir(build_dir) + run((args.qmake, src_dir)) + run((args.make)) + +def package(): + global package_dir + print 'package ...' + os.chdir(package_dir) + shutil.copytree(os.path.join(build_dir, 'bin'), os.path.join(package_dir, 'bin'), ignore = shutil.ignore_patterns("*.exe.manifest")) + shutil.copytree(os.path.join(build_dir, 'doc'), os.path.join(package_dir, 'doc')) + shutil.copytree(os.path.join(src_dir, 'examples'), os.path.join(package_dir, 'examples')) + shutil.copy(os.path.join(src_dir, 'README'), package_dir) + # create 7z + archive_file = os.path.join(src_dir, 'dist', 'packages', 'org.qtproject.ifw.binaries', 'data', 'data.7z') + if not os.path.exists(os.path.dirname(archive_file)): + os.makedirs(os.path.dirname(archive_file)) + run((os.path.join(package_dir, 'bin', 'archivegen'), archive_file, '*')) + # run installer + binary_creator = os.path.join(build_dir, 'bin', 'binarycreator') + config_file = os.path.join(src_dir, 'dist', 'config', 'config.xml') + package_dir = os.path.join(src_dir, 'dist', 'packages') + installer_path = os.path.join(src_dir, 'dist', 'packages') + run((binary_creator, '--offline-only', '-c', config_file, '-p', package_dir, target_path)) + + +parse_arguments() +init() +build_docs() +build() +package() + +print 'DONE, installer is at ' + target_path -- cgit v1.2.3 From c064509db928d6538ebb7d53a1ad03fcc7025b4d Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Tue, 19 Mar 2013 20:08:34 +0200 Subject: Update files-to-patch files Updated existing Qt4 specific files and added embedded specific files. Change-Id: I0a23816ce8288b6c635d667bc51854299fba54a1 Reviewed-by: Tim Jenssen --- src/libs/installer/resources/files-to-patch-linux | 74 ++-------------------- .../resources/files-to-patch-linux-emb-arm | 8 +++ src/libs/installer/resources/files-to-patch-macx | 48 ++------------ .../installer/resources/files-to-patch-windows | 57 ++--------------- .../resources/files-to-patch-windows-emb-arm | 7 ++ 5 files changed, 32 insertions(+), 162 deletions(-) create mode 100644 src/libs/installer/resources/files-to-patch-linux-emb-arm create mode 100644 src/libs/installer/resources/files-to-patch-windows-emb-arm diff --git a/src/libs/installer/resources/files-to-patch-linux b/src/libs/installer/resources/files-to-patch-linux index 9c7b39f4a..760127f99 100644 --- a/src/libs/installer/resources/files-to-patch-linux +++ b/src/libs/installer/resources/files-to-patch-linux @@ -2,71 +2,9 @@ bin/qmake bin/lrelease lib/libQtCore.so %% -lib/libQtCore.la -lib/libQt3Support.la -lib/libQtCLucene.la -lib/libQtDBus.la -lib/libQtDeclarative.la -lib/libQtGui.la -lib/libQtHelp.la -lib/libQtMultimedia.la -lib/libQtNetwork.la -lib/libQtOpenGL.la -lib/libphonon.la -lib/libQtScript.la -lib/libQtScriptTools.la -lib/libQtSql.la -lib/libQtSvg.la -lib/libQtTest.la -lib/libQtWebKit.la -lib/libQtXml.la -lib/libQtXmlPatterns.la -demos/shared/libdemo_shared.prl -lib/libQt3Support.prl -lib/libQtAssistantClient.prl -lib/libQtCLucene.prl -lib/libQtCore.prl -lib/libQtDBus.prl -lib/libQtDesignerComponents.prl -lib/libQtDesigner.prl -lib/libQtDeclarative.prl -lib/libQtGui.prl -lib/libQtHelp.prl -lib/libQtMultimedia.prl -lib/libQtNetwork.prl -lib/libQtOpenGL.prl -lib/libQtScript.prl -lib/libQtScriptTools.prl -lib/libQtSql.prl -lib/libQtSvg.prl -lib/libQtTest.prl -lib/libQtUiTools.prl -lib/libQtWebKit.prl -lib/libQtXmlPatterns.prl -lib/libQtXml.prl -lib/libphonon.prl -lib/libqtmain.prl -lib/pkgconfig/phonon.pc -lib/pkgconfig/Qt3Support.pc -lib/pkgconfig/QtAssistantClient.pc -lib/pkgconfig/QtCLucene.pc -lib/pkgconfig/QtCore.pc -lib/pkgconfig/QtDBus.pc -lib/pkgconfig/QtDeclarative.pc -lib/pkgconfig/QtDesignerComponents.pc -lib/pkgconfig/QtDesigner.pc -lib/pkgconfig/QtGui.pc -lib/pkgconfig/QtHelp.pc -lib/pkgconfig/QtMultimedia.pc -lib/pkgconfig/QtNetwork.pc -lib/pkgconfig/QtOpenGL.pc -lib/pkgconfig/QtScript.pc -lib/pkgconfig/QtScriptTools.pc -lib/pkgconfig/QtSql.pc -lib/pkgconfig/QtSvg.pc -lib/pkgconfig/QtTest.pc -lib/pkgconfig/QtUiTools.pc -lib/pkgconfig/QtWebKit.pc -lib/pkgconfig/QtXmlPatterns.pc -lib/pkgconfig/QtXml.pc -mkspecs/qconfig.pri +*.la +*.prl +*.pc +*.pri +mkspecs/default-host/qmake.conf + diff --git a/src/libs/installer/resources/files-to-patch-linux-emb-arm b/src/libs/installer/resources/files-to-patch-linux-emb-arm new file mode 100644 index 000000000..ea400d715 --- /dev/null +++ b/src/libs/installer/resources/files-to-patch-linux-emb-arm @@ -0,0 +1,8 @@ +bin/qmake +bin/lrelease +%% +*.la +*.prl +*.pc +*.pri + diff --git a/src/libs/installer/resources/files-to-patch-macx b/src/libs/installer/resources/files-to-patch-macx index 28b19fb7c..20644f2d1 100644 --- a/src/libs/installer/resources/files-to-patch-macx +++ b/src/libs/installer/resources/files-to-patch-macx @@ -17,46 +17,8 @@ bin/qhelpconverter.app/Contents/MacOS/qhelpconverter bin/QMLViewer.app/Contents/MacOS/QMLViewer bin/qttracereplay.app/Contents/MacOS/qttracereplay %% -lib/QtCore.la -lib/libQtCLucene.la -lib/QtDeclarative.la -lib/QtGui.la -lib/QtHelp.la -lib/QtMultimedia.la -lib/QtNetwork.la -lib/QtOpenGL.la -lib/phonon.la -lib/QtScript.la -lib/QtScriptTools.la -lib/QtSql.la -lib/QtSvg.la -lib/QtTest.la -lib/QtWebKit.la -lib/QtXml.la -lib/QtXmlPatterns.la -lib/libQtCLucene.prl -lib/libQtUiTools.prl -lib/pkgconfig/phonon.pc -lib/pkgconfig/Qt3Support.pc -lib/pkgconfig/QtAssistantClient.pc -lib/pkgconfig/QtCLucene.pc -lib/pkgconfig/QtCore.pc -lib/pkgconfig/QtDBus.pc -lib/pkgconfig/QtDeclarative.pc -lib/pkgconfig/QtDesignerComponents.pc -lib/pkgconfig/QtDesigner.pc -lib/pkgconfig/QtGui.pc -lib/pkgconfig/QtHelp.pc -lib/pkgconfig/QtMultimedia.pc -lib/pkgconfig/QtNetwork.pc -lib/pkgconfig/QtOpenGL.pc -lib/pkgconfig/QtScript.pc -lib/pkgconfig/QtScriptTools.pc -lib/pkgconfig/QtSql.pc -lib/pkgconfig/QtSvg.pc -lib/pkgconfig/QtTest.pc -lib/pkgconfig/QtUiTools.pc -lib/pkgconfig/QtWebKit.pc -lib/pkgconfig/QtXmlPatterns.pc -lib/pkgconfig/QtXml.pc -mkspecs/qconfig.pri +*.la +*.prl +*.pc +*.pri +mkspecs/default-host/qmake.conf \ No newline at end of file diff --git a/src/libs/installer/resources/files-to-patch-windows b/src/libs/installer/resources/files-to-patch-windows index 845a299ce..6f931ec4f 100644 --- a/src/libs/installer/resources/files-to-patch-windows +++ b/src/libs/installer/resources/files-to-patch-windows @@ -6,55 +6,10 @@ lib/QtCore4.dll lib/QtCored4.dll %% mkspecs/default/qmake.conf -demos/shared/libdemo_shared.prl -lib/Qt3Support.prl -lib/QtAssistantClient.prl -lib/QtCLucene.prl -lib/QtCore.prl -lib/QtDesignerComponents.prl -lib/QtDesigner.prl -lib/QtGui.prl -lib/QtHelp.prl -lib/QtMultimedia.prl -lib/QtNetwork.prl -lib/QtOpenGL.prl -lib/QtScript.prl -lib/QtScriptTools.prl -lib/QtSql.prl -lib/QtSvg.prl -lib/QtTest.prl -lib/QtUiTools.prl -lib/QtWebKit.prl -lib/QtXmlPatterns.prl -lib/QtXml.prl -lib/Qt3Supportd.prl -lib/QtAssistantClientd.prl -lib/QtCLucened.prl -lib/QtCored.prl -lib/QtDesignerComponentsd.prl -lib/QtDesignerd.prl -lib/QtGuid.prl -lib/QtHelpd.prl -lib/QtMultimediad.prl -lib/QtNetworkd.prl -lib/QtOpenGLd.prl -lib/QtScriptd.prl -lib/QtScriptToolsd.prl -lib/QtSqld.prl -lib/QtSvgd.prl -lib/QtTestd.prl -lib/QtUiToolsd.prl -lib/QtWebKitd.prl -lib/QtXmlPatternsd.prl -lib/QtXmld.prl -lib/phonon.prl -lib/phonond.prl -lib/QtDeclarative.prl -lib/QtDeclaratived.prl -lib/qtmain.prl -lib/qtmaind.prl -lib/QAxContainer.prl -lib/QAxContainerd.prl -lib/QAxServer.prl -lib/QAxServerd.prl +mkspecs/default-host/qmake.conf .qmake.cache +*.prl +*.pc +*.la +*.pri +lib/prl.txt diff --git a/src/libs/installer/resources/files-to-patch-windows-emb-arm b/src/libs/installer/resources/files-to-patch-windows-emb-arm new file mode 100644 index 000000000..6ff8f9903 --- /dev/null +++ b/src/libs/installer/resources/files-to-patch-windows-emb-arm @@ -0,0 +1,7 @@ +bin/qmake.exe +bin/lrelease.exe +%% +*.la +*.prl +*.pc +*.pri -- cgit v1.2.3 From 4cde7b2ed657e5cc2f5f7c071f4ff0a7dd20d56b Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 18 Mar 2013 13:17:58 +0100 Subject: Fix missing wizard icon on a windows static build. Q_IMPORT_PLUGIN() macros are needed in application code only for Qt4, in Qt5 those are automatically generated by qmake. Change-Id: Ic75795be402592a0595bb3aa084d0b7ee9a9f8c5 Reviewed-by: Niels Weber Reviewed-by: Karsten Heimrich Reviewed-by: Tim Jenssen --- installerfw.pri | 2 ++ src/libs/installer/fileutils.cpp | 31 +++++++++++++++++-------------- src/libs/installer/init.cpp | 15 ++++++++++++--- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/installerfw.pri b/installerfw.pri index 0dcc1b5e4..ec7b88fb4 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -82,12 +82,14 @@ macx:LIBS += -framework Carbon -framework Security isEqual(QT_MAJOR_VERSION, 4) { CONFIG += uitools CONFIG(static, static|shared) { + QTPLUGIN += qico DEFINES += QT_STATIC QT += script network xml } } else { QT += uitools core-private CONFIG(static, static|shared) { + QTPLUGIN += qico QT += concurrent network script xml } } diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index e2a995dba..315a34f5d 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include @@ -557,20 +558,21 @@ typedef struct { void QInstaller::setApplicationIcon(const QString &application, const QString &icon) { - wchar_t* const path = new wchar_t[application.length() + 1]; - QDir::toNativeSeparators(application).toWCharArray(path); - path[application.length()] = 0; - - HANDLE updateRes = BeginUpdateResource(path, false); - delete[] path; - QFile iconFile(icon); - if (!iconFile.open(QIODevice::ReadOnly)) + if (!iconFile.open(QIODevice::ReadOnly)) { + qWarning() << QString::fromLatin1("Could not use '%1' as application icon: %2.") + .arg(icon, iconFile.errorString()); return; + } - QByteArray temp = iconFile.readAll(); + if (QImageReader::imageFormat(icon) != "ico") { + qWarning() << QString::fromLatin1("Could not use '%1' as application icon, unsupported format %2.") + .arg(icon, QLatin1String(QImageReader::imageFormat(icon))); + return; + } - ICONDIR* ig = reinterpret_cast< ICONDIR* >(temp.data()); + QByteArray temp = iconFile.readAll(); + ICONDIR* ig = reinterpret_cast (temp.data()); DWORD newSize = sizeof(GRPICONDIR) + sizeof(GRPICONDIRENTRY) * (ig->idCount - 1); GRPICONDIR* newDir = reinterpret_cast< GRPICONDIR* >(new char[newSize]); @@ -578,6 +580,7 @@ void QInstaller::setApplicationIcon(const QString &application, const QString &i newDir->idType = ig->idType; newDir->idCount = ig->idCount; + HANDLE updateRes = BeginUpdateResourceW((wchar_t*)QDir::toNativeSeparators(application).utf16(), false); for (int i = 0; i < ig->idCount; ++i) { char* temp1 = temp.data() + ig->idEntries[i].dwImageOffset; DWORD size1 = ig->idEntries[i].dwBytesInRes; @@ -591,16 +594,16 @@ void QInstaller::setApplicationIcon(const QString &application, const QString &i newDir->idEntries[i].dwBytesInRes = ig->idEntries[i].dwBytesInRes; newDir->idEntries[i].nID = i + 1; - UpdateResource(updateRes, RT_ICON, MAKEINTRESOURCE(i + 1), + UpdateResourceW(updateRes, RT_ICON, MAKEINTRESOURCE(i + 1), MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), temp1, size1); } - UpdateResource(updateRes, RT_GROUP_ICON, L"IDI_ICON1", MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), newDir - , newSize); + UpdateResourceW(updateRes, RT_GROUP_ICON, L"IDI_ICON1", MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), + newDir, newSize); delete [] newDir; - EndUpdateResource(updateRes, false); + EndUpdateResourceW(updateRes, false); } #endif diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index e0c51a2f3..40c396ab4 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -85,6 +85,8 @@ #include +#include + #include namespace NArchive { @@ -151,10 +153,17 @@ static void initArchives() CrcGenerateTable(); } +#if defined(QT_STATIC) static void initResources() { Q_INIT_RESOURCE(patch_file_lists); + Q_INIT_RESOURCE(installer); +# if QT_VERSION < 0x050000 + Q_IMPORT_PLUGIN(qico) + Q_UNUSED(qt_plugin_instance_qico()); +# endif } +#endif static QByteArray trimAndPrepend(QtMsgType type, const QByteArray &msg) { @@ -220,7 +229,10 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt void QInstaller::init() { +#if defined(QT_STATIC) + ::initArchives(); ::initResources(); +#endif UpdateOperationFactory &factory = UpdateOperationFactory::instance(); factory.registerUpdateOperation(QLatin1String("CreateShortcut")); @@ -262,9 +274,6 @@ void QInstaller::init() factory.registerUpdateOperation(QLatin1String("ReplaceInstallNames")); #endif // Q_OS_MAC - // load 7z stuff, if we're a static lib - ::initArchives(); - // qDebug -> verbose() #if QT_VERSION < 0x050000 qInstallMsgHandler(messageHandler); -- cgit v1.2.3 From bb5d8be66eb1ccd15b87369d9668ab342587a828 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 21 Mar 2013 16:34:38 +0100 Subject: fix crash in HttpDownloader If the download destination can not be opened it will shutdown everything. Which deletes the destination file object. Change-Id: Id16c71bf1157aa82984a9ad8462b1b8cc92bdd24 Reviewed-by: Karsten Heimrich --- src/libs/kdtools/kdupdaterfiledownloader.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp index a026fc3c4..9ad3861dd 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp @@ -848,10 +848,11 @@ void KDUpdater::HttpDownloader::httpReadyRead() while (written < read) { const qint64 numWritten = d->destination->write(buffer.data() + written, read - written); if (numWritten < 0) { - const QString err = d->destination->errorString(); + const QString error = d->destination->errorString(); + const QString fileName = d->destination->fileName(); d->shutDown(); - setDownloadAborted(tr("Cannot download %1: Writing to temporary file failed: %2") - .arg(url().toString(), err)); + setDownloadAborted(tr("Cannot download %1: Writing to file '%2' failed: %3") + .arg(url().toString(), fileName, error)); return; } written += numWritten; @@ -977,9 +978,11 @@ void KDUpdater::HttpDownloader::startDownload(const QUrl &url) } if (!d->destination->isOpen()) { + const QString error = d->destination->errorString(); + const QString fileName = d->destination->fileName(); d->shutDown(); - setDownloadAborted(tr("Cannot download %1: Could not create temporary file: %2").arg(url.toString(), - d->destination->errorString())); + setDownloadAborted(tr("Cannot download %1: Could not create %2: %3").arg( + url.toString(), fileName, error)); } } -- cgit v1.2.3 From 3ff993b7bcbb74f7ba4a2e2a5ff2fce207c39961 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 21 Mar 2013 16:26:27 +0100 Subject: fix possible loop in moveDirectoryContents method If the user wants to move the content of a directory in a subdirectory, it shouldn't copy itself. Change-Id: I5d5d1b8bdb315b8122fb77ada779d46a63cd2277 Reviewed-by: Karsten Heimrich --- src/libs/installer/fileutils.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index 315a34f5d..be08aa8ad 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -393,8 +393,11 @@ void QInstaller::moveDirectoryContents(const QString &sourceDir, const QString & while (it.hasNext()) { const QFileInfo i(it.next()); if (i.isDir()) { - moveDirectoryContents(QDir(sourceDir).absoluteFilePath(i.fileName()), - QDir(targetDir).absoluteFilePath(i.fileName())); + // only copy directories that are not the target to avoid loop dir creations + QString newSource = QDir(sourceDir).absoluteFilePath(i.fileName()); + if (QDir(newSource) != QDir(targetDir)) { + moveDirectoryContents(newSource, QDir(targetDir).absoluteFilePath(i.fileName())); + } } else { QFile f(i.filePath()); const QString target = QDir(targetDir).absoluteFilePath(i.fileName()); -- cgit v1.2.3 From 3fb931187386aadd4329e763b8a276ee0bc5ab77 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 21 Mar 2013 16:27:19 +0100 Subject: don't pollute output too much Change-Id: I554abf932ad6907155078cf132cdddda8414fe65 Reviewed-by: Karsten Heimrich --- src/libs/installer/fileutils.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index be08aa8ad..ab7ad6df4 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -358,7 +358,6 @@ void QInstaller::removeSystemGeneratedFiles(const QString &path) void QInstaller::copyDirectoryContents(const QString &sourceDir, const QString &targetDir) { - qDebug() << "Copying" << sourceDir << "to" << targetDir; Q_ASSERT(QFileInfo(sourceDir).isDir()); Q_ASSERT(!QFileInfo(targetDir).exists() || QFileInfo(targetDir).isDir()); if (!QDir().mkpath(targetDir)) @@ -383,7 +382,6 @@ void QInstaller::copyDirectoryContents(const QString &sourceDir, const QString & void QInstaller::moveDirectoryContents(const QString &sourceDir, const QString &targetDir) { - qDebug() << "Moving" << sourceDir << "to" << targetDir; Q_ASSERT(QFileInfo(sourceDir).isDir()); Q_ASSERT(!QFileInfo(targetDir).exists() || QFileInfo(targetDir).isDir()); if (!QDir().mkpath(targetDir)) -- cgit v1.2.3