Commit Graph

8 Commits

Author SHA1 Message Date
Jani Heikkinen
83a5694dc2 Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Outdated header.LGPL removed (use header.LGPL21 instead)

Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing
combination. New header.LGPL-COMM taken in the use file which were
using old header.LGPL3 (src/plugins/platforms/android/extract.cpp)

Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license
combination

Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe
Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
2015-02-11 06:49:51 +00:00
Raphael Kubo da Costa
350c60b79e Link against QMAKE_LIBS_EXECINFO when using backtrace(3).
Add a new mkspec variable, QMAKE_LIBS_EXECINFO, for platforms where
backtrace(3), backtrace_symbols(3) and others are not in libc, but
rather in a separate library -- on the BSDs, this is libexecinfo.

Use it in corelib/global/global.pri so that libqt5core links against it
and has the proper dependency when necessary.

Change-Id: I62ac36c9b3ba7ab0719420cb795087d43ec138a4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2015-01-03 14:48:53 +01:00
Oswald Buddenhagen
d7a5dc0cfd Merge remote-tracking branch 'origin/5.3' into 5.4.0
Conflicts:
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5
2014-11-10 11:39:35 +01:00
Raphael Kubo da Costa
cfa73537cc Stop including g++-unix.conf in the freebsd-clang mkspec.
Most of the settings there end up overwritten by the clang.conf include
that comes afterwards, except for a few things such as QMAKE_LINK_C,
which remains set to "gcc" and breaks things when one uses
CONFIG=use_c_linker.

QMAKE_LFLAGS_NOUNDEF was coming from g++-unix.conf, though, so we now
manually set it in freebsd-clang's qmake.conf.

Change-Id: Ibd16f59d43eb19e72adf4919da9ce3007100b60f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-05 10:45:42 +01:00
Matti Paaso
974c210835 Update license headers and add new license files
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL

Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-09-24 12:26:19 +02:00
Raphael Kubo da Costa
231da210ea Do not set QMAKE_{INC,LIB}DIR_{OPENGL,X11} in the freebsd mkspecs.
X11 and the GL libraries are installed into /usr/local like other
software, and this has been the case for many years.

Change-Id: Ied4d9d61154014db3861bdbd6a5bdbe68e76f878
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-08-15 19:54:02 +02:00
Raphael Kubo da Costa
f630eb1120 Remove reference to gdb_dwarf_index from the freebsd-clang mkspec.
Follow-up to 9de2853a ("Remove automated generation of dwarf index"):
gdb_dwarf_index.prf does not exist anymore, so stop referencing it.

Change-Id: I22464d5b81a50a2f58218d74a424f3a790aa1df0
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-08-15 15:40:31 +02:00
Gabriel de Dietrich
bf7e1315b7 Add freebsd-clang mkspec
clang is the default compiler on FreeBSD 10 (if not earlier).

Let's keep it unsupported for now. Can be promoted later.

Change-Id: I909953c986a3da09ce19d8f9f9ee2cc22c417abd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-22 12:46:14 +01:00