AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,375 Commits 4 Branches 0 Tags 339 MiB
e8e3049d31
Commit Graph

11 Commits

Author SHA1 Message Date
Oswald Buddenhagen
143c4d3e13 Merge remote-tracking branch 'origin/master' into api_changes 
Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
 2012-04-10 15:31:45 +02:00
Stephen Kelly
df43b9a06a Don't use the pri depends line for link dependencies. 
That is not what depends is for.

Change-Id: Iabf93e890f009bd6c8fcc18dde1891bf20a493f1
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-03-28 00:51:32 +02:00
Stephen Kelly
b20cbf7102 Move CMake macros and tests for dbus tools from qttools. 
Change-Id: I9d589a2d33eb8fcac63443565bb3e2319be3e04f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2012-03-18 14:14:57 +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
4fc6bc4804 Print out the try_compile output for tests expected to fail. 
This way, ctest -V shows that it fails for the expected reason.

Change-Id: I97589d4e90d889ea0b10dbd6192526712dbfdd8e
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-21 18:58:47 +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
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
1de30075a2 Add missing subdirectory test. 
Change-Id: If59f124ce8be520c8c8692ac4f1400552749557b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-02-07 18:05:06 +01:00
Stephen Kelly
e22431d719 Test that the CMAKE_AUTOMOC feature works with Qt5. 
Update the wrapper macro which had bitrotted a bit.

Change-Id: I65c7940f9ebc0e1c963fddd2bbfc06b89e66df04
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-01-12 00:45:40 +01:00
Stephen Kelly
e838cf644f Test that options to macros work. 
Change-Id: Id2f57cc2f64ae25f5f84d1206035b7a2c309d1c7
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2011-12-06 20:14:10 +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