diff options
139 files changed, 93 insertions, 514 deletions
@@ -1,3 +1,5 @@ +Copyright (c) 2009-2023 Code Synthesis Tools CC. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation. diff --git a/Makefile.am b/Makefile.am index 4220eae..9326a27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ # file : Makefile.am -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file SUBDIRS = __path__(dirs) @@ -1,7 +1,6 @@ #! /bin/sh # file : bootstrap -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file # diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000..4a730a3 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,3 @@ +config.build +root/ +bootstrap/ diff --git a/build/bootstrap.build b/build/bootstrap.build index d377762..dfb36a2 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/bootstrap.build -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file project = libodb-qt diff --git a/build/bootstrap.make b/build/bootstrap.make index d7a4eb5..be09351 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -1,5 +1,4 @@ # file : build/bootstrap.make -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file project_name := libodb-qt diff --git a/build/export.build b/build/export.build index eb488b2..bd72576 100644 --- a/build/export.build +++ b/build/export.build @@ -1,5 +1,4 @@ # file : build/export.build -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $out_root/ diff --git a/build/export/libodb-qt/stub.make b/build/export/libodb-qt/stub.make index 195530e..de06c20 100644 --- a/build/export/libodb-qt/stub.make +++ b/build/export/libodb-qt/stub.make @@ -1,5 +1,4 @@ # file : build/export/libodb-qt/stub.make -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(call include-once,$(src_root)/odb/qt/makefile,$(out_root)) diff --git a/build/import/libodb-qt/LICENSE b/build/import/libodb-qt/LICENSE deleted file mode 120000 index 5853aae..0000000 --- a/build/import/libodb-qt/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../LICENSE
\ No newline at end of file diff --git a/build/import/libodb-qt/configuration-rules.make b/build/import/libodb-qt/configuration-rules.make index 38c7352..9765a0c 100644 --- a/build/import/libodb-qt/configuration-rules.make +++ b/build/import/libodb-qt/configuration-rules.make @@ -1,5 +1,4 @@ # file : build/import/libodb-qt/configuration-rules.make -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libodb-qt/configuration-dynamic.make: | $(dcf_root)/import/libodb-qt/. diff --git a/build/import/libodb-qt/configure b/build/import/libodb-qt/configure index 0a879ea..6213974 100755 --- a/build/import/libodb-qt/configure +++ b/build/import/libodb-qt/configure @@ -1,7 +1,6 @@ #! /usr/bin/env bash # file : build/import/libodb-qt/configure -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file diff --git a/build/import/libodb-qt/stub.make b/build/import/libodb-qt/stub.make index 1bce523..bd5e2ea 100644 --- a/build/import/libodb-qt/stub.make +++ b/build/import/libodb-qt/stub.make @@ -1,5 +1,4 @@ # file : build/import/libodb-qt/stub.make -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(call include-once,$(scf_root)/import/libodb-qt/configuration-rules.make,$(dcf_root)) diff --git a/build/import/libodb/LICENSE b/build/import/libodb/LICENSE deleted file mode 100644 index ed9c55c..0000000 --- a/build/import/libodb/LICENSE +++ /dev/null @@ -1,12 +0,0 @@ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License version 2 as -published by the Free Software Foundation. - -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 details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/build/import/libodb/configuration-rules.make b/build/import/libodb/configuration-rules.make index 872cbb3..340c418 100644 --- a/build/import/libodb/configuration-rules.make +++ b/build/import/libodb/configuration-rules.make @@ -1,5 +1,4 @@ # file : build/import/libodb/configuration-rules.make -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libodb/configuration-dynamic.make: | $(dcf_root)/import/libodb/. diff --git a/build/import/libodb/configure b/build/import/libodb/configure index 0d57a5f..261a202 100755 --- a/build/import/libodb/configure +++ b/build/import/libodb/configure @@ -1,7 +1,6 @@ #! /usr/bin/env bash # file : build/import/libodb/configure -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file diff --git a/build/import/libodb/stub.make b/build/import/libodb/stub.make index 6b7088d..04dc786 100644 --- a/build/import/libodb/stub.make +++ b/build/import/libodb/stub.make @@ -1,5 +1,4 @@ # file : build/import/libodb/stub.make -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(call include-once,$(scf_root)/import/libodb/configuration-rules.make,$(dcf_root)) diff --git a/build/import/libqt/LICENSE b/build/import/libqt/LICENSE deleted file mode 100644 index 3912109..0000000 --- a/build/import/libqt/LICENSE +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, 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. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) 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 -this service 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 make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. 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. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program 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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to -this License. - - 7. 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program 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. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 12. 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 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. - - 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 -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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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 2 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, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision 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, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This 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 Library General -Public License instead of this License. diff --git a/build/import/libqt/configuration-rules.make b/build/import/libqt/configuration-rules.make index 820294b..badc561 100644 --- a/build/import/libqt/configuration-rules.make +++ b/build/import/libqt/configuration-rules.make @@ -1,5 +1,4 @@ # file : build/import/libqt/configuration-rules.make -# copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libqt/configuration-dynamic.make: | $(dcf_root)/import/libqt/. diff --git a/build/import/libqt/configure b/build/import/libqt/configure index 837b0d3..904d126 100755 --- a/build/import/libqt/configure +++ b/build/import/libqt/configure @@ -1,7 +1,6 @@ #! /usr/bin/env bash # file : build/import/libqt/configure -# copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file diff --git a/build/import/libqt/core/rules.make b/build/import/libqt/core/rules.make index bbec36e..1fd6f10 100644 --- a/build/import/libqt/core/rules.make +++ b/build/import/libqt/core/rules.make @@ -1,5 +1,4 @@ # file : build/import/libqt/core/rules.make -# copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(dcf_root)/import/libqt/%: root := $(libqt_root) diff --git a/build/import/libqt/core/stub.make b/build/import/libqt/core/stub.make index 47f67b2..1a13bde 100644 --- a/build/import/libqt/core/stub.make +++ b/build/import/libqt/core/stub.make @@ -1,5 +1,4 @@ # file : build/import/libqt/core/stub.make -# copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(call include-once,$(scf_root)/import/libqt/configuration-rules.make,$(dcf_root)) diff --git a/build/root.build b/build/root.build index 697f33c..882047d 100644 --- a/build/root.build +++ b/build/root.build @@ -1,8 +1,7 @@ # file : build/root.build -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file -cxx.std = 11 +cxx.std = latest using cxx @@ -11,8 +10,8 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -if ($cxx.class == 'msvc') -{ +if ($cxx.target.system == 'win32-msvc') cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS + +if ($cxx.class == 'msvc') cxx.coptions += /wd4251 /wd4275 /wd4800 -} @@ -1,8 +1,7 @@ # file : buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file -./: {*/ -build/ -m4/} doc{INSTALL LICENSE NEWS README} manifest +./: {*/ -build/ -m4/} doc{INSTALL NEWS README} legal{LICENSE} manifest # Don't install tests or the INSTALL file. # diff --git a/configure.ac b/configure.ac index c2a078e..483f4c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,4 @@ # file : configure.ac -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file AC_PREREQ(2.60) diff --git a/libodb-qt.pc.in b/libodb-qt.pc.in index 9994509..c22a62f 100644 --- a/libodb-qt.pc.in +++ b/libodb-qt.pc.in @@ -1,5 +1,4 @@ # file : libodb-qt.pc.in -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file prefix=@prefix@ diff --git a/m4/disable-rpath.m4 b/m4/disable-rpath.m4 index 7874d4b..0864209 100644 --- a/m4/disable-rpath.m4 +++ b/m4/disable-rpath.m4 @@ -1,5 +1,4 @@ dnl file : m4/disable-rpath.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl AC_DEFUN([DISABLE_RPATH],[ diff --git a/m4/libodb.m4 b/m4/libodb.m4 index 5f140bd..0dba7c4 100644 --- a/m4/libodb.m4 +++ b/m4/libodb.m4 @@ -1,5 +1,4 @@ dnl file : m4/libodb.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl dnl LIBODB([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) diff --git a/m4/libqt.m4 b/m4/libqt.m4 index 79ddab3..f053d79 100644 --- a/m4/libqt.m4 +++ b/m4/libqt.m4 @@ -1,5 +1,4 @@ dnl file : m4/libqt.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl dnl diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4 index 635793f..302639f 100644 --- a/m4/libtool-link.m4 +++ b/m4/libtool-link.m4 @@ -1,5 +1,4 @@ dnl file : m4/libtool-link.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl dnl diff --git a/m4/pkgconfig.m4 b/m4/pkgconfig.m4 index d5aa2d0..c48ea56 100644 --- a/m4/pkgconfig.m4 +++ b/m4/pkgconfig.m4 @@ -1,5 +1,4 @@ dnl file : m4/pkgconfig.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl AC_DEFUN([PKGCONFIG],[ diff --git a/m4/static-lib.m4 b/m4/static-lib.m4 index 79b89cd..5fb1c11 100644 --- a/m4/static-lib.m4 +++ b/m4/static-lib.m4 @@ -1,5 +1,4 @@ dnl file : m4/static-lib.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl dnl STATIC_LIB(MACRO, DESCRIPTION) diff --git a/m4/threads.m4 b/m4/threads.m4 index 10bdfdd..6f2e25f 100644 --- a/m4/threads.m4 +++ b/m4/threads.m4 @@ -1,5 +1,4 @@ dnl file : m4/threads.m4 -dnl copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC dnl license : GNU GPL v2; see accompanying LICENSE file dnl AC_DEFUN([THREADS],[ @@ -1,5 +1,4 @@ # file : makefile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make @@ -1,21 +1,21 @@ : 1 name: libodb-qt -version: 2.5.0-b.16.z +version: 2.5.0-b.26.z project: odb summary: Qt ODB profile library -license: GPLv2 -license: proprietary -tags: qt, c++, orm, database, relational, object, persistence, sql +license: GPL-2.0-only +license: other: proprietary ; Not free/open source. +topics: C++, ORM, Qt, SQL description-file: README changes-file: NEWS url: https://www.codesynthesis.com/products/odb/ doc-url: https://www.codesynthesis.com/products/odb/doc/manual.xhtml src-url: https://git.codesynthesis.com/cgit/odb/libodb-qt/ email: odb-users@codesynthesis.com -build-email: odb-builds@codesynthesis.com +build-warning-email: odb-builds@codesynthesis.com builds: all requires: c++11 requires: libqt-core ; Requires not yet packaged libqt-core. -depends: * build2 >= 0.11.0 -depends: * bpkg >= 0.11.0 -depends: libodb [2.5.0-b.16.1 2.5.0-b.17) +depends: * build2 >= 0.16.0- +depends: * bpkg >= 0.16.0- +depends: libodb [2.5.0-b.26.1 2.5.0-b.27) diff --git a/odb/qt.options b/odb/qt.options index 4263b85..1e31135 100644 --- a/odb/qt.options +++ b/odb/qt.options @@ -1,5 +1,4 @@ # file : odb/qt.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/basic diff --git a/odb/qt/Makefile.am b/odb/qt/Makefile.am index e33dba8..7edbe1d 100644 --- a/odb/qt/Makefile.am +++ b/odb/qt/Makefile.am @@ -1,5 +1,4 @@ # file : odb/qt/Makefile.am -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file lib_LTLIBRARIES = libodb-qt.la diff --git a/odb/qt/basic.options b/odb/qt/basic.options index 3ec810a..306d949 100644 --- a/odb/qt/basic.options +++ b/odb/qt/basic.options @@ -1,5 +1,4 @@ # file : odb/qt/basic.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/basic/basic diff --git a/odb/qt/basic/basic-common.options b/odb/qt/basic/basic-common.options index 612c680..f704314 100644 --- a/odb/qt/basic/basic-common.options +++ b/odb/qt/basic/basic-common.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-common.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-mssql.options b/odb/qt/basic/basic-mssql.options index 24018bc..2234df5 100644 --- a/odb/qt/basic/basic-mssql.options +++ b/odb/qt/basic/basic-mssql.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-mssql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-mysql.options b/odb/qt/basic/basic-mysql.options index 083bad7..d049f4e 100644 --- a/odb/qt/basic/basic-mysql.options +++ b/odb/qt/basic/basic-mysql.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-mysql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-oracle.options b/odb/qt/basic/basic-oracle.options index 27df415..60ef9d0 100644 --- a/odb/qt/basic/basic-oracle.options +++ b/odb/qt/basic/basic-oracle.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-oracle.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-pgsql.options b/odb/qt/basic/basic-pgsql.options index 1480f5b..6f0dc6e 100644 --- a/odb/qt/basic/basic-pgsql.options +++ b/odb/qt/basic/basic-pgsql.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-pgsql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/basic-sqlite.options b/odb/qt/basic/basic-sqlite.options index 5c0aba2..c64e37c 100644 --- a/odb/qt/basic/basic-sqlite.options +++ b/odb/qt/basic/basic-sqlite.options @@ -1,5 +1,4 @@ # file : odb/qt/basic/basic-sqlite.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/basic/mssql/default-mapping.hxx b/odb/qt/basic/mssql/default-mapping.hxx index a22b0f8..19fd43b 100644 --- a/odb/qt/basic/mssql/default-mapping.hxx +++ b/odb/qt/basic/mssql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/mssql/qbyte-array-traits.hxx b/odb/qt/basic/mssql/qbyte-array-traits.hxx index 3452c52..8047691 100644 --- a/odb/qt/basic/mssql/qbyte-array-traits.hxx +++ b/odb/qt/basic/mssql/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/mssql/qstring-traits.hxx b/odb/qt/basic/mssql/qstring-traits.hxx index f89d5fd..779120e 100644 --- a/odb/qt/basic/mssql/qstring-traits.hxx +++ b/odb/qt/basic/mssql/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/mssql/quuid-traits.hxx b/odb/qt/basic/mssql/quuid-traits.hxx index 5f10982..d65b80f 100644 --- a/odb/qt/basic/mssql/quuid-traits.hxx +++ b/odb/qt/basic/mssql/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mssql/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MSSQL_UUID_TRAITS_HXX diff --git a/odb/qt/basic/mysql/default-mapping.hxx b/odb/qt/basic/mysql/default-mapping.hxx index 00b4e4e..996895f 100644 --- a/odb/qt/basic/mysql/default-mapping.hxx +++ b/odb/qt/basic/mysql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/mysql/qbyte-array-traits.hxx b/odb/qt/basic/mysql/qbyte-array-traits.hxx index 4ecad02..bfcfc69 100644 --- a/odb/qt/basic/mysql/qbyte-array-traits.hxx +++ b/odb/qt/basic/mysql/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/mysql/qstring-traits.hxx b/odb/qt/basic/mysql/qstring-traits.hxx index e70be83..6a5f315 100644 --- a/odb/qt/basic/mysql/qstring-traits.hxx +++ b/odb/qt/basic/mysql/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/mysql/quuid-traits.hxx b/odb/qt/basic/mysql/quuid-traits.hxx index 3b0e09a..c672ee8 100644 --- a/odb/qt/basic/mysql/quuid-traits.hxx +++ b/odb/qt/basic/mysql/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/mysql/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_MYSQL_UUID_TRAITS_HXX diff --git a/odb/qt/basic/oracle/default-mapping.hxx b/odb/qt/basic/oracle/default-mapping.hxx index 275254c..8d72206 100644 --- a/odb/qt/basic/oracle/default-mapping.hxx +++ b/odb/qt/basic/oracle/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/oracle/qbyte-array-traits.hxx b/odb/qt/basic/oracle/qbyte-array-traits.hxx index 40c30ef..6979cc9 100644 --- a/odb/qt/basic/oracle/qbyte-array-traits.hxx +++ b/odb/qt/basic/oracle/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/oracle/qstring-traits.hxx b/odb/qt/basic/oracle/qstring-traits.hxx index d089a55..418d30e 100644 --- a/odb/qt/basic/oracle/qstring-traits.hxx +++ b/odb/qt/basic/oracle/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/oracle/quuid-traits.hxx b/odb/qt/basic/oracle/quuid-traits.hxx index eed9599..5f8041e 100644 --- a/odb/qt/basic/oracle/quuid-traits.hxx +++ b/odb/qt/basic/oracle/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/oracle/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_ORACLE_UUID_TRAITS_HXX diff --git a/odb/qt/basic/pgsql/default-mapping.hxx b/odb/qt/basic/pgsql/default-mapping.hxx index 1911b5b..13dbeb8 100644 --- a/odb/qt/basic/pgsql/default-mapping.hxx +++ b/odb/qt/basic/pgsql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/pgsql/qbyte-array-traits.hxx b/odb/qt/basic/pgsql/qbyte-array-traits.hxx index 8ebce30..3c3c496 100644 --- a/odb/qt/basic/pgsql/qbyte-array-traits.hxx +++ b/odb/qt/basic/pgsql/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/pgsql/qstring-traits.hxx b/odb/qt/basic/pgsql/qstring-traits.hxx index 01c862a..f1ab53c 100644 --- a/odb/qt/basic/pgsql/qstring-traits.hxx +++ b/odb/qt/basic/pgsql/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/pgsql/quuid-traits.hxx b/odb/qt/basic/pgsql/quuid-traits.hxx index 0a840bf..5999b7e 100644 --- a/odb/qt/basic/pgsql/quuid-traits.hxx +++ b/odb/qt/basic/pgsql/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/pgsql/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_PGSQL_UUID_TRAITS_HXX diff --git a/odb/qt/basic/sqlite/default-mapping.hxx b/odb/qt/basic/sqlite/default-mapping.hxx index 259316b..7d14a6c 100644 --- a/odb/qt/basic/sqlite/default-mapping.hxx +++ b/odb/qt/basic/sqlite/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/basic/sqlite/qbyte-array-traits.hxx b/odb/qt/basic/sqlite/qbyte-array-traits.hxx index 39c66cd..8a26bb1 100644 --- a/odb/qt/basic/sqlite/qbyte-array-traits.hxx +++ b/odb/qt/basic/sqlite/qbyte-array-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/qbyte-array-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_QBYTE_ARRAY_TRAITS_HXX diff --git a/odb/qt/basic/sqlite/qstring-traits.hxx b/odb/qt/basic/sqlite/qstring-traits.hxx index 0762fc8..30a2136 100644 --- a/odb/qt/basic/sqlite/qstring-traits.hxx +++ b/odb/qt/basic/sqlite/qstring-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/qstring-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_QSTRING_TRAITS_HXX diff --git a/odb/qt/basic/sqlite/quuid-traits.hxx b/odb/qt/basic/sqlite/quuid-traits.hxx index f142e1b..20d4a94 100644 --- a/odb/qt/basic/sqlite/quuid-traits.hxx +++ b/odb/qt/basic/sqlite/quuid-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/basic/sqlite/uuid-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_BASIC_SQLITE_UUID_TRAITS_HXX diff --git a/odb/qt/buildfile b/odb/qt/buildfile index e8c8d55..63e6c95 100644 --- a/odb/qt/buildfile +++ b/odb/qt/buildfile @@ -1,5 +1,4 @@ # file : odb/qt/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file ../ @@ -79,7 +78,7 @@ { h{*}: install = false - if ($cxx.class == 'msvc') + if ($cxx.target.system == 'win32-msvc') { h{config-vc}@./: install = $install_include/details/ h{config-vc-stub}@./: install = $install_include/details/build2/config-vc.h diff --git a/odb/qt/containers.options b/odb/qt/containers.options index c8f8464..337b064 100644 --- a/odb/qt/containers.options +++ b/odb/qt/containers.options @@ -1,5 +1,4 @@ # file : odb/qt/containers.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # licences : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/containers/list-iterator.hxx b/odb/qt/containers/list-iterator.hxx index 3414e69..67f56fd 100644 --- a/odb/qt/containers/list-iterator.hxx +++ b/odb/qt/containers/list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_LIST_ITERATOR_HXX diff --git a/odb/qt/containers/list-traits.hxx b/odb/qt/containers/list-traits.hxx index 11f5260..5a3ee38 100644 --- a/odb/qt/containers/list-traits.hxx +++ b/odb/qt/containers/list-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_LIST_TRAITS_HXX diff --git a/odb/qt/containers/list-traits.txx b/odb/qt/containers/list-traits.txx index 12dd58c..105fc2a 100644 --- a/odb/qt/containers/list-traits.txx +++ b/odb/qt/containers/list-traits.txx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list-traits.txx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file namespace odb diff --git a/odb/qt/containers/list.hxx b/odb/qt/containers/list.hxx index 5dd85ec..143deed 100644 --- a/odb/qt/containers/list.hxx +++ b/odb/qt/containers/list.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_LIST_HXX @@ -47,8 +46,14 @@ public: #endif #ifdef ODB_CXX11 - QOdbList(QOdbList &&x): vector_base (std::move (x)), l_ (std::move (x.l_)) {} + QOdbList(QOdbList &&x) noexcept + : vector_base (std::move (x)), l_ (std::move (x.l_)) {} + + // Note: noexcept is not specified since it can throw while reallocating + // impl_. + // QOdbList &operator=(QOdbList &&other); + #if defined(ODB_CXX11_INITIALIZER_LIST) && \ defined(Q_COMPILER_INITIALIZER_LISTS) QOdbList(std::initializer_list<T> il): l_ (il) {} diff --git a/odb/qt/containers/list.ixx b/odb/qt/containers/list.ixx index f211d64..d9d37b6 100644 --- a/odb/qt/containers/list.ixx +++ b/odb/qt/containers/list.ixx @@ -1,5 +1,4 @@ // file : odb/qt/containers/list.ixx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file // diff --git a/odb/qt/containers/mutable-list-iterator.hxx b/odb/qt/containers/mutable-list-iterator.hxx index bd6f17e..271633a 100644 --- a/odb/qt/containers/mutable-list-iterator.hxx +++ b/odb/qt/containers/mutable-list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/mutable-list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINERS_MUTABLE_LIST_ITERATOR_HXX diff --git a/odb/qt/containers/qhash-traits.hxx b/odb/qt/containers/qhash-traits.hxx index c82c8d0..9f42d37 100644 --- a/odb/qt/containers/qhash-traits.hxx +++ b/odb/qt/containers/qhash-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qhash-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QHASH_TRAITS_HXX diff --git a/odb/qt/containers/qlinked-list-traits.hxx b/odb/qt/containers/qlinked-list-traits.hxx index 64e950f..3bfc9e9 100644 --- a/odb/qt/containers/qlinked-list-traits.hxx +++ b/odb/qt/containers/qlinked-list-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qlinked-list-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QLINKED_LIST_TRAITS_HXX @@ -7,6 +6,13 @@ #include <odb/pre.hxx> +#include <QtCore/QtGlobal> // QT_VERSION + +// QLinkedList is deprecated since Qt5 5.15 and in Qt6 it has been moved to a +// separate library. +// +#if (QT_VERSION < 0x050F00) || ODB_QT_FORCE_QLINKEDLIST + #include <QtCore/QLinkedList> #include <odb/container-traits.hxx> @@ -69,6 +75,8 @@ namespace odb }; } +#endif + #include <odb/post.hxx> #endif // ODB_QT_CONTAINER_QLINKED_LIST_TRAITS_HXX diff --git a/odb/qt/containers/qlist-traits.hxx b/odb/qt/containers/qlist-traits.hxx index 54e1b68..572d02a 100644 --- a/odb/qt/containers/qlist-traits.hxx +++ b/odb/qt/containers/qlist-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qlist-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QLIST_TRAITS_HXX diff --git a/odb/qt/containers/qmap-traits.hxx b/odb/qt/containers/qmap-traits.hxx index 87d950f..5f13b29 100644 --- a/odb/qt/containers/qmap-traits.hxx +++ b/odb/qt/containers/qmap-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qmap-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QMAP_TRAITS_HXX diff --git a/odb/qt/containers/qset-traits.hxx b/odb/qt/containers/qset-traits.hxx index 3b7f031..fbea8b7 100644 --- a/odb/qt/containers/qset-traits.hxx +++ b/odb/qt/containers/qset-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qset-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QSET_TRAITS_HXX diff --git a/odb/qt/containers/qvector-traits.hxx b/odb/qt/containers/qvector-traits.hxx index c483b0c..516475d 100644 --- a/odb/qt/containers/qvector-traits.hxx +++ b/odb/qt/containers/qvector-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/containers/qvector-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_CONTAINER_QVECTOR_TRAITS_HXX @@ -7,6 +6,14 @@ #include <odb/pre.hxx> +#include <QtCore/QtGlobal> // QT_VERSION + +// In Qt 6 QVector is an alias for QList. +// +#if QT_VERSION >= 0x060000 +#include <odb/qt/containers/qlist-traits.hxx> +#else + #include <QtCore/QVector> #include <odb/container-traits.hxx> @@ -68,6 +75,8 @@ namespace odb }; } +#endif + #include <odb/post.hxx> #endif // ODB_QT_CONTAINER_QVECTOR_TRAITS_HXX diff --git a/odb/qt/date-time.options b/odb/qt/date-time.options index cecd5c8..d199649 100644 --- a/odb/qt/date-time.options +++ b/odb/qt/date-time.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/date-time/date-time diff --git a/odb/qt/date-time/date-time-common.options b/odb/qt/date-time/date-time-common.options index 5bffbfd..d813259 100644 --- a/odb/qt/date-time/date-time-common.options +++ b/odb/qt/date-time/date-time-common.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-common.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-mssql.options b/odb/qt/date-time/date-time-mssql.options index 4fb0371..7e35b4d 100644 --- a/odb/qt/date-time/date-time-mssql.options +++ b/odb/qt/date-time/date-time-mssql.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-mssql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-mysql.options b/odb/qt/date-time/date-time-mysql.options index 7d800d3..fdbb364 100644 --- a/odb/qt/date-time/date-time-mysql.options +++ b/odb/qt/date-time/date-time-mysql.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-mysql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-oracle.options b/odb/qt/date-time/date-time-oracle.options index aa2cfe2..c339ce3 100644 --- a/odb/qt/date-time/date-time-oracle.options +++ b/odb/qt/date-time/date-time-oracle.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-oracle.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-pgsql.options b/odb/qt/date-time/date-time-pgsql.options index 2f73492..9d80d48 100644 --- a/odb/qt/date-time/date-time-pgsql.options +++ b/odb/qt/date-time/date-time-pgsql.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-pgsql.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/date-time-sqlite.options b/odb/qt/date-time/date-time-sqlite.options index 2cde697..8eb1110 100644 --- a/odb/qt/date-time/date-time-sqlite.options +++ b/odb/qt/date-time/date-time-sqlite.options @@ -1,5 +1,4 @@ # file : odb/qt/date-time/date-time-sqlite.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/date-time/exceptions.cxx b/odb/qt/date-time/exceptions.cxx index 68d4856..48f0540 100644 --- a/odb/qt/date-time/exceptions.cxx +++ b/odb/qt/date-time/exceptions.cxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/exceptions.cxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #include <odb/qt/date-time/exceptions.hxx> diff --git a/odb/qt/date-time/exceptions.hxx b/odb/qt/date-time/exceptions.hxx index 1bfcb98..7a73be2 100644 --- a/odb/qt/date-time/exceptions.hxx +++ b/odb/qt/date-time/exceptions.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/exceptions.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_EXCEPTIONS_HXX diff --git a/odb/qt/date-time/mssql/default-mapping.hxx b/odb/qt/date-time/mssql/default-mapping.hxx index 263c64d..a8acb6b 100644 --- a/odb/qt/date-time/mssql/default-mapping.hxx +++ b/odb/qt/date-time/mssql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/mssql/qdate-time-traits.hxx b/odb/qt/date-time/mssql/qdate-time-traits.hxx index 296d054..5fd8a98 100644 --- a/odb/qt/date-time/mssql/qdate-time-traits.hxx +++ b/odb/qt/date-time/mssql/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/qdate-time-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/mssql/qdate-traits.hxx b/odb/qt/date-time/mssql/qdate-traits.hxx index 960330a..caa5d3c 100644 --- a/odb/qt/date-time/mssql/qdate-traits.hxx +++ b/odb/qt/date-time/mssql/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/mssql/qtime-traits.hxx b/odb/qt/date-time/mssql/qtime-traits.hxx index 76c363d..88fbf41 100644 --- a/odb/qt/date-time/mssql/qtime-traits.hxx +++ b/odb/qt/date-time/mssql/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mssql/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MSSQL_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/mysql/default-mapping.hxx b/odb/qt/date-time/mysql/default-mapping.hxx index 20f0dd3..a88c507 100644 --- a/odb/qt/date-time/mysql/default-mapping.hxx +++ b/odb/qt/date-time/mysql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/mysql/qdate-time-traits.hxx b/odb/qt/date-time/mysql/qdate-time-traits.hxx index ecd1aa6..92279eb 100644 --- a/odb/qt/date-time/mysql/qdate-time-traits.hxx +++ b/odb/qt/date-time/mysql/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/qdate-time-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/mysql/qdate-traits.hxx b/odb/qt/date-time/mysql/qdate-traits.hxx index 2078c49..12a00ec 100644 --- a/odb/qt/date-time/mysql/qdate-traits.hxx +++ b/odb/qt/date-time/mysql/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/mysql/qtime-traits.hxx b/odb/qt/date-time/mysql/qtime-traits.hxx index b35139c..c96e13f 100644 --- a/odb/qt/date-time/mysql/qtime-traits.hxx +++ b/odb/qt/date-time/mysql/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/mysql/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_MYSQL_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/oracle/default-mapping.hxx b/odb/qt/date-time/oracle/default-mapping.hxx index 196553d..32a733a 100644 --- a/odb/qt/date-time/oracle/default-mapping.hxx +++ b/odb/qt/date-time/oracle/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/oracle/qdate-time-traits.hxx b/odb/qt/date-time/oracle/qdate-time-traits.hxx index 2c2bfe4..ba90075 100644 --- a/odb/qt/date-time/oracle/qdate-time-traits.hxx +++ b/odb/qt/date-time/oracle/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/qdate-time-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/oracle/qdate-traits.hxx b/odb/qt/date-time/oracle/qdate-traits.hxx index 101e18a..f293e2d 100644 --- a/odb/qt/date-time/oracle/qdate-traits.hxx +++ b/odb/qt/date-time/oracle/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/oracle/qtime-traits.hxx b/odb/qt/date-time/oracle/qtime-traits.hxx index 7f1b175..0d9aff4 100644 --- a/odb/qt/date-time/oracle/qtime-traits.hxx +++ b/odb/qt/date-time/oracle/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/oracle/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_ORACLE_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/pgsql/default-mapping.hxx b/odb/qt/date-time/pgsql/default-mapping.hxx index 1d83a07..cd3b1b5 100644 --- a/odb/qt/date-time/pgsql/default-mapping.hxx +++ b/odb/qt/date-time/pgsql/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/pgsql/qdate-time-traits.hxx b/odb/qt/date-time/pgsql/qdate-time-traits.hxx index 4e91456..a9fe757 100644 --- a/odb/qt/date-time/pgsql/qdate-time-traits.hxx +++ b/odb/qt/date-time/pgsql/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/qdatetime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_QDATETIME_TRAITS_HXX diff --git a/odb/qt/date-time/pgsql/qdate-traits.hxx b/odb/qt/date-time/pgsql/qdate-traits.hxx index d21323c..b7cc7d4 100644 --- a/odb/qt/date-time/pgsql/qdate-traits.hxx +++ b/odb/qt/date-time/pgsql/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_QDATE_TRAITS_HXX diff --git a/odb/qt/date-time/pgsql/qtime-traits.hxx b/odb/qt/date-time/pgsql/qtime-traits.hxx index 4f48f32..86a594b 100644 --- a/odb/qt/date-time/pgsql/qtime-traits.hxx +++ b/odb/qt/date-time/pgsql/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/pgsql/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_PGSQL_QTIME_TRAITS_HXX diff --git a/odb/qt/date-time/sqlite/default-mapping.hxx b/odb/qt/date-time/sqlite/default-mapping.hxx index 03e146c..a150ca9 100644 --- a/odb/qt/date-time/sqlite/default-mapping.hxx +++ b/odb/qt/date-time/sqlite/default-mapping.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/default-mapping.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_DEFAULT_MAPPING_HXX diff --git a/odb/qt/date-time/sqlite/qdate-time-traits.hxx b/odb/qt/date-time/sqlite/qdate-time-traits.hxx index 2c08b29..db561fc 100644 --- a/odb/qt/date-time/sqlite/qdate-time-traits.hxx +++ b/odb/qt/date-time/sqlite/qdate-time-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/qdatetime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_QDATETIME_TRAITS_HXX @@ -11,6 +10,8 @@ #include <cstddef> // std::size_t #include <cstring> // std::memcpy +#include <QtCore/QtGlobal> // QT_VERSION + #include <QtCore/QDateTime> #include <odb/details/buffer.hxx> @@ -91,7 +92,14 @@ namespace odb else { v.setTimeSpec (Qt::UTC); - v.setTime_t (static_cast <uint> (i)); + + // *Time_t() functions are deprecated in favor of *SecsSinceEpoch(). + // +#if QT_VERSION < 0x060000 + v.setTime_t (static_cast<uint> (i)); +#else + v.setSecsSinceEpoch (static_cast<qint64> (i)); +#endif } } @@ -107,7 +115,12 @@ namespace odb else { is_null = false; + +#if QT_VERSION < 0x060000 i = static_cast<long long> (v.toTime_t ()); +#else + i = static_cast<long long> (v.toSecsSinceEpoch ()); +#endif } } }; diff --git a/odb/qt/date-time/sqlite/qdate-traits.hxx b/odb/qt/date-time/sqlite/qdate-traits.hxx index 825ce1b..52721b7 100644 --- a/odb/qt/date-time/sqlite/qdate-traits.hxx +++ b/odb/qt/date-time/sqlite/qdate-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/qdate-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_QDATE_TRAITS_HXX @@ -11,7 +10,10 @@ #include <cstddef> // std::size_t #include <cstring> // std::memcpy +#include <QtCore/QtGlobal> // QT_VERSION + #include <QtCore/QDate> +#include <QtCore/QDateTime> #include <odb/details/buffer.hxx> #include <odb/sqlite/traits.hxx> @@ -93,8 +95,14 @@ namespace odb { QDateTime dt; dt.setTimeSpec (Qt::UTC); - dt.setTime_t (static_cast<uint> (i)); + // *Time_t() functions are deprecated in favor of *SecsSinceEpoch(). + // +#if QT_VERSION < 0x060000 + dt.setTime_t (static_cast<uint> (i)); +#else + dt.setSecsSinceEpoch (static_cast<qint64> (i)); +#endif v = dt.date (); } } @@ -109,8 +117,13 @@ namespace odb else { is_null = false; - i = static_cast<long long> ( - QDateTime (v, QTime (0, 0, 0), Qt::UTC).toTime_t ()); + const QDateTime dt (v, QTime (0, 0, 0), Qt::UTC); + +#if QT_VERSION < 0x060000 + i = static_cast<long long> (dt.toTime_t ()); +#else + i = static_cast<long long> (dt.toSecsSinceEpoch ()); +#endif } } }; diff --git a/odb/qt/date-time/sqlite/qtime-traits.hxx b/odb/qt/date-time/sqlite/qtime-traits.hxx index 8b57abd..dd86399 100644 --- a/odb/qt/date-time/sqlite/qtime-traits.hxx +++ b/odb/qt/date-time/sqlite/qtime-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/date-time/sqlite/qtime-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DATE_TIME_SQLITE_QTIME_TRAITS_HXX diff --git a/odb/qt/details/build2/config-stub.h b/odb/qt/details/build2/config-stub.h index 7d724a4..fbb2971 100644 --- a/odb/qt/details/build2/config-stub.h +++ b/odb/qt/details/build2/config-stub.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config-stub.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/build2/config-vc-stub.h b/odb/qt/details/build2/config-vc-stub.h index c4051f8..e6a412d 100644 --- a/odb/qt/details/build2/config-vc-stub.h +++ b/odb/qt/details/build2/config-vc-stub.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config-vc-stub.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/build2/config-vc.h b/odb/qt/details/build2/config-vc.h index 43f7d6a..36113ce 100644 --- a/odb/qt/details/build2/config-vc.h +++ b/odb/qt/details/build2/config-vc.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config-vc.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/build2/config.h b/odb/qt/details/build2/config.h index a864e08..12d168f 100644 --- a/odb/qt/details/build2/config.h +++ b/odb/qt/details/build2/config.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/build2/config.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/config-vc.h b/odb/qt/details/config-vc.h index db08247..6718a07 100644 --- a/odb/qt/details/config-vc.h +++ b/odb/qt/details/config-vc.h @@ -1,5 +1,4 @@ /* file : odb/qt/details/config-vc.h - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/config.h.in b/odb/qt/details/config.h.in index 2250691..a0c3989 100644 --- a/odb/qt/details/config.h.in +++ b/odb/qt/details/config.h.in @@ -1,5 +1,4 @@ /* file : odb/qt/details/config.h.in - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : GNU GPL v2; see accompanying LICENSE file */ diff --git a/odb/qt/details/config.hxx b/odb/qt/details/config.hxx index 08030bd..9077380 100644 --- a/odb/qt/details/config.hxx +++ b/odb/qt/details/config.hxx @@ -1,5 +1,4 @@ // file : odb/qt/details/config.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DETAILS_CONFIG_HXX diff --git a/odb/qt/details/export.hxx b/odb/qt/details/export.hxx index 9b93df5..4c0097f 100644 --- a/odb/qt/details/export.hxx +++ b/odb/qt/details/export.hxx @@ -1,5 +1,4 @@ // file : odb/qt/details/export.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_DETAILS_EXPORT_HXX diff --git a/odb/qt/exception.hxx b/odb/qt/exception.hxx index a5ed1bb..44646d5 100644 --- a/odb/qt/exception.hxx +++ b/odb/qt/exception.hxx @@ -1,5 +1,4 @@ // file : odb/qt/exception.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_EXCEPTION_HXX diff --git a/odb/qt/lazy-ptr.hxx b/odb/qt/lazy-ptr.hxx index 1d5090d..6e5a3e0 100644 --- a/odb/qt/lazy-ptr.hxx +++ b/odb/qt/lazy-ptr.hxx @@ -1,5 +1,4 @@ // file : odb/qt/lazy-ptr.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_LAZY_PTR_HXX diff --git a/odb/qt/list-iterator.hxx b/odb/qt/list-iterator.hxx index d6f5ffb..bb8b20c 100644 --- a/odb/qt/list-iterator.hxx +++ b/odb/qt/list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_LIST_ITERATOR_HXX diff --git a/odb/qt/list.hxx b/odb/qt/list.hxx index b833677..7918ef6 100644 --- a/odb/qt/list.hxx +++ b/odb/qt/list.hxx @@ -1,5 +1,4 @@ // file : odb/qt/list.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_LIST_HXX diff --git a/odb/qt/makefile b/odb/qt/makefile index 64b06cd..0c46805 100644 --- a/odb/qt/makefile +++ b/odb/qt/makefile @@ -1,5 +1,4 @@ # file : odb/qt/makefile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make diff --git a/odb/qt/mutable-list-iterator.hxx b/odb/qt/mutable-list-iterator.hxx index a511aa9..045ae99 100644 --- a/odb/qt/mutable-list-iterator.hxx +++ b/odb/qt/mutable-list-iterator.hxx @@ -1,5 +1,4 @@ // file : odb/qt/mutable-list-iterator.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_MUTABLE_LIST_ITERATOR_HXX diff --git a/odb/qt/smart-ptr.options b/odb/qt/smart-ptr.options index 7ce10f3..b95b39b 100644 --- a/odb/qt/smart-ptr.options +++ b/odb/qt/smart-ptr.options @@ -1,5 +1,4 @@ # file : odb/qt/smart-ptr.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file --profile qt/version diff --git a/odb/qt/smart-ptr/lazy-pointer-traits.hxx b/odb/qt/smart-ptr/lazy-pointer-traits.hxx index 545f008..6c7aa38 100644 --- a/odb/qt/smart-ptr/lazy-pointer-traits.hxx +++ b/odb/qt/smart-ptr/lazy-pointer-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-pointer-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_LAZY_POINTER_TRAITS_HXX diff --git a/odb/qt/smart-ptr/lazy-ptr.hxx b/odb/qt/smart-ptr/lazy-ptr.hxx index 9326998..865e355 100644 --- a/odb/qt/smart-ptr/lazy-ptr.hxx +++ b/odb/qt/smart-ptr/lazy-ptr.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-ptr.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_LAZY_PTR_HXX diff --git a/odb/qt/smart-ptr/lazy-ptr.ixx b/odb/qt/smart-ptr/lazy-ptr.ixx index 8757872..b9e6de8 100644 --- a/odb/qt/smart-ptr/lazy-ptr.ixx +++ b/odb/qt/smart-ptr/lazy-ptr.ixx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-ptr.ixx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file // diff --git a/odb/qt/smart-ptr/lazy-ptr.txx b/odb/qt/smart-ptr/lazy-ptr.txx index e842942..0ae038a 100644 --- a/odb/qt/smart-ptr/lazy-ptr.txx +++ b/odb/qt/smart-ptr/lazy-ptr.txx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/lazy-ptr.txx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file template <class T> diff --git a/odb/qt/smart-ptr/pointer-traits.hxx b/odb/qt/smart-ptr/pointer-traits.hxx index bb171c3..f5cbc39 100644 --- a/odb/qt/smart-ptr/pointer-traits.hxx +++ b/odb/qt/smart-ptr/pointer-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/pointer-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_POINTER_TRAITS_HXX diff --git a/odb/qt/smart-ptr/wrapper-traits.hxx b/odb/qt/smart-ptr/wrapper-traits.hxx index c08c5e1..dc6cb02 100644 --- a/odb/qt/smart-ptr/wrapper-traits.hxx +++ b/odb/qt/smart-ptr/wrapper-traits.hxx @@ -1,5 +1,4 @@ // file : odb/qt/smart-ptr/wrapper-traits.hxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef ODB_QT_SMART_PTR_WRAPPER_TRAITS_HXX diff --git a/odb/qt/version-build2-stub.hxx b/odb/qt/version-build2-stub.hxx index bf1e6e7..b00d1de 100644 --- a/odb/qt/version-build2-stub.hxx +++ b/odb/qt/version-build2-stub.hxx @@ -1,5 +1,4 @@ // file : odb/qt/version-build2-stub.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #include <odb/qt/version.hxx> diff --git a/odb/qt/version-build2.hxx.in b/odb/qt/version-build2.hxx.in index 2c13d7e..51f1191 100644 --- a/odb/qt/version-build2.hxx.in +++ b/odb/qt/version-build2.hxx.in @@ -1,12 +1,11 @@ // file : odb/qt/version-build2.hxx.in -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifndef LIBODB_QT_VERSION // Note: using the version macro itself. // @@ TODO: need to derive automatically (it is also hardcoded in *.options). // -#define ODB_QT_VERSION 2046600 +#define ODB_QT_VERSION 2047600 // The numeric version format is AAAAABBBBBCCCCCDDDE where: // diff --git a/odb/qt/version.hxx b/odb/qt/version.hxx index ef41c2e..4f9510a 100644 --- a/odb/qt/version.hxx +++ b/odb/qt/version.hxx @@ -1,5 +1,4 @@ // file : odb/qt/version.hxx -// copyright : Copyright (c) 2005-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file #ifdef LIBODB_QT_BUILD2 @@ -32,23 +31,23 @@ // Check that we have compatible ODB version. // -#if ODB_VERSION != 20466 +#if ODB_VERSION != 20476 # error incompatible odb interface version detected #endif // ODB Qt interface version: odb interface version plus the Qt interface // version. // -#define ODB_QT_VERSION 2046600 -#define ODB_QT_VERSION_STR "2.5.0-b.16" +#define ODB_QT_VERSION 2047600 +#define ODB_QT_VERSION_STR "2.5.0-b.26" // libodb-qt version: odb interface version plus the bugfix version. Note // that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION // since if the Qt interface virsion is incremented then the bugfix version // must be incremented as well. // -#define LIBODB_QT_VERSION 2049966 -#define LIBODB_QT_VERSION_STR "2.5.0-b.16" +#define LIBODB_QT_VERSION 2049976 +#define LIBODB_QT_VERSION_STR "2.5.0-b.26" #include <odb/post.hxx> diff --git a/odb/qt/version.options b/odb/qt/version.options index 7f69091..0fef537 100644 --- a/odb/qt/version.options +++ b/odb/qt/version.options @@ -1,5 +1,4 @@ # file : odb/qt/version.options -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file # Include the config file first so that it can do its thing before we @@ -12,6 +11,6 @@ # --hxx-prologue '#include <odb/qt/version.hxx>' ---hxx-prologue '#if ODB_QT_VERSION != 2046600 // 2.5.0-b.16' +--hxx-prologue '#if ODB_QT_VERSION != 2047600 // 2.5.0-b.26' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..e54525b --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1 @@ +driver diff --git a/tests/basics/buildfile b/tests/basics/buildfile index 870d7e8..900e57a 100644 --- a/tests/basics/buildfile +++ b/tests/basics/buildfile @@ -1,5 +1,4 @@ # file : tests/basics/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file import libs = libodb-qt%lib{odb-qt} diff --git a/tests/basics/driver.cxx b/tests/basics/driver.cxx index 651095c..01e0d55 100644 --- a/tests/basics/driver.cxx +++ b/tests/basics/driver.cxx @@ -1,5 +1,4 @@ // file : tests/basics/driver.cxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file // Basic test to make sure the library is usable. Functionality testing diff --git a/tests/build/.gitignore b/tests/build/.gitignore new file mode 100644 index 0000000..4a730a3 --- /dev/null +++ b/tests/build/.gitignore @@ -0,0 +1,3 @@ +config.build +root/ +bootstrap/ diff --git a/tests/build/bootstrap.build b/tests/build/bootstrap.build index c5c067b..6ee38db 100644 --- a/tests/build/bootstrap.build +++ b/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file project = # Unnamed subproject. diff --git a/tests/build/root.build b/tests/build/root.build index ac9d361..6c5a90b 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -1,19 +1,18 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file -cxx.std = 11 +cxx.std = latest using cxx hxx{*}: extension = hxx cxx{*}: extension = cxx -if ($cxx.class == 'msvc') -{ +if ($cxx.target.system == 'win32-msvc') cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS + +if ($cxx.class == 'msvc') cxx.coptions += /wd4251 /wd4275 /wd4800 -} # Every exe{} in this subproject is by default a test. # diff --git a/tests/buildfile b/tests/buildfile index 3614001..57588a4 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file ./: {*/ -build/} @@ -1 +1 @@ -2.5.0-b.16 +2.5.0-b.26 |