whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,878 Commits
1 Branch
0 Tags
407 MiB
Commit Graph

15 Commits (ddb70bee2fd323ddc4273aec5d40d975f50d2904)

Author SHA1 Message Date
Stephen Kelly 6c2e57e688 Make the CONFIG and QT_CONFIG contents available downstream. 
Change-Id: I62dbc5a695e41179de9f6acd11aa7bc592cac6f3
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-03-02 15:55:29 +01:00
Stephen Kelly 018e78575c Make the CMake files work with directory overrides. 
This allows us to create correct CMake config files when Qt is
configured with directories outside of the prefix (which Qt allows),
and also allows us to use correct values when a 'longer' relative
lib directory is used such as lib/x86_64-linux-gnu.

Change-Id: I6f88255a23752dc5b84cb20ce13fdeeee9d5ad51
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-28 21:07:16 +01:00
Stephen Kelly bd5096d012 Add the QtMain windows library to the CMake files. 
Change-Id: Iff8b9bdd4b069721103e1cd5854e56b6116d7549
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-23 23:46:01 +01:00
Stephen Kelly 26cf615c96 Add the QT_LIBINFIX to the CMake config files. 
Change-Id: If7bec54eca2d28cba314ce94a1ab1831c024ad31
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-22 19:25:06 +01:00
Stephen Kelly 4d0d49a92c Use QMAKE_SUBSTITUTIONS conditionals 
Instead of generating CMake conditionals.

Change-Id: I3d987cc08666270e618222be9292558e73bc961e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-02-22 19:25:06 +01:00
Stephen Kelly 361cd9f9b2 Give the compile flags an EXECUTABLE_ prefix. 
The fPIE flag should only be used with executables.

Change-Id: If799ae4a7fe2492af3aac67651659a52d365024a
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-21 22:31:00 +01:00
Stephen Kelly 1b08a48588 Only define QT_NAMESPACE if it is used. 
Fixes non-namespaced builds.

Change-Id: I0ec3c29f58042313dfa864f15c2b2d47914cdedb
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-17 16:42:28 +01:00
Stephen Kelly 3ea33062d4 Use ctest to run all tests and print output. 
Change-Id: Ib5a8513cc2d08adce49602b2590059b918b1ffda
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-17 05:27:34 +01:00
Stephen Kelly 7e11fdd6e6 Only define QT_NAMESPACE if it is used. 
Fixes non-namespaced builds.

Change-Id: Ie743fc57e7f208fdd50c61b08dc8a4b150de3930
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-17 05:27:31 +01:00
Stephen Kelly c455674555 Make the cmake tests work with a namespace build. 
Change-Id: I6858c324548373c57963b5ef137772a1f780ec78
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-15 18:17:15 +01:00
Stephen Kelly 1406659948 Add -fPIE to the Qt5Core_COMPILE_FLAGS with reduce-relocations. 
Qt requires this since 482d96a0c5

Change-Id: Iba783e283b17654abf46f11b81cc1641c3ce7d83
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-10 19:21:24 +01:00
Stephen Kelly 3a706b17d3 Add the mkspecs dir to the include dirs. 
Change-Id: If844785d7d3645c33e0fcb1206cc52f8ab644070
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-08 03:13:26 +01:00
Stephen Kelly c023f5600a Remove plugin related variables from the CMake files. 
It doesn't currently have any effect and needs to be re-thought
anyway.

Change-Id: I6e620ca5b341264bbf5279a19e8f25af8fa7d396
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2011-12-19 10:42:02 +01:00
Stephen Kelly 23ab6a726a Add the .exe suffix to executables on Windows. 
Change-Id: I257bb7d62ae18ea529df6b10694fcf25eedc83f4
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-12-12 19:10:34 +01:00
Stephen Kelly a482487b9f Install CMake config files from Qt. 
This includes a BSD licenced file Qt5CoreMacros.cmake which is
adapted from Qt4Macros.cmake in the CMake source tree.

Change-Id: I54326b808795535490a0489659b351a8da72cdbb
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-11-29 17:08:39 +01:00