Commit Graph

19 Commits

Author SHA1 Message Date
Martin Jansa b8a236df79 qt5: Fix cmake config files
* without syncqt cmake config files have empty PRIVATE_INCLUDE_DIRS
  remove pregenerated header files and create .git dir to let qmake
  call syncqt and generate headers like when building from git recipes

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-12 15:03:21 +01:00
Martin Jansa 4c197c6223 qmake5_base: Define OE_QMAKE_PATH_QT_* variables
* and move it to separate .bbclass which is easier to
  replace in distro layer when you don't care about
  conflicts with qt4

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 21:41:32 +02:00
Martin Jansa d8314098bf qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables and add it back in qt5.inc
* we're using QT_DIR_NAME subdirectory mostly to prevent conflicts with existing files from qt4
  but setting it in all OE_QMAKE_PATH_* variables causes all apps which are just using qmake to
  build to install e.g. in /qt5 which for stuff like qterminal or something doesn't
  sound right (as long as there isn't qterminal4 and qterminal5 recipe)

* some variables are kept with default QT_DIR_NAME, e.g. qml, imports, plugins we can assume that
  every application which installs some QML files will install them in location shared by all

* add qt5-native.inc which also adds this QT_DIR_NAME and common
  inherits (later will be used also by qtwayland-native.inc)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 5d5ba83cc6 qt5-native: rename to qtbase-native to avoid confusion
* we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what
* drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-17 16:08:56 +02:00
Eric Blade a376cc61ed qt5: upgrade to 5.0.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-02-18 00:55:04 +01:00
Martin Jansa 9f04cb7bb6 qt5: move module specific files to own directories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-01-01 20:32:34 +01:00
Mikko Levonmaa 17d2bf1cdd qtbase: mkspecs are now staged correctly
They are placed under STAGING_DATADIR as they need to be
kept separate from the native side. The reason for doing so
is that some qt modules require native tools and the mkspecs
in STAGING_DATADIR_NATIVE cannot be polluted with the target
mkspecs

There are still some packaging issues

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-04 17:03:14 -08:00
Martin Jansa 93fc33ea28 qt5-native: explicitly disable xcb
* otherwise we need for -system-xcb
  libxcb-native libxau-native libxdmcp-native xcb-util-wm-native
  xcb-util-image-native xcb-util-keysyms-native
  or for -qt-xcb
  libxcb-native libxau-native libxdmcp-native
  and fix underlinking in xcb linking test (QMAKE_LIBS_XCB)
  | linking xcb
  | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXau.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link)
  | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXdmcp.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link)
  | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauDisposeAuth'
  | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauGetBestAuthByAddr'
  | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XdmcpWrap'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-12-04 02:27:46 +01:00
Mikko Levonmaa ff173560e2 qtbase: partially resolves module pri installation
The pri files get correctly placed under the work dir, but fail
to stage correctly. Also there are some packaging issues

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:15:35 -08:00
Mikko Levonmaa c3e8e8de59 qt5-native: mkspecs are now installed correctly
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:15:35 -08:00
Mikko Levonmaa 05d88f867d qt5-native: Always compile and install uic
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-12-03 11:11:58 -08:00
Otavio Salvador ead13659ca qt5-native: Allow override of qt.conf path
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-11-19 17:27:34 -02:00
Martin Jansa edb7f7413e qt5-native: add -qt-xcb to EXTRA_OECONF
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-11-18 18:01:21 +01:00
Mikko Levonmaa 4ec2e9d2d8 qt5-native: install mkspecs and our g++.conf + linux.conf
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-11-15 21:40:54 +01:00
Martin Jansa 8eec015508 qt5-native: change PV of 5.0.0-beta2 to sort lower then 5.0.0 when it's released
* also add version specific .inc files and move all version specific
  variables to it
* upgrade 5.0.0-beta1 to 5.0.0-beta2 and add include for latest git

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-11-15 21:40:50 +01:00
Martin Jansa 3546f08c5b qt5-native: install all native tools
* e.g. we need qdbusxml2cpp to build connman-qt

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-11-15 19:04:56 +01:00
Martin Jansa bc43214dd2 qt5-native: disable demos
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-10-27 22:30:55 +02:00
Mikko Levonmaa 671410bb40 qt5-native now compiles and installs
Disabled tests and exmaples in the native build. Also do_install
now installs the qmake host binary

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
2012-10-24 15:46:25 -07:00
Otavio Salvador 4927bd8c56 qt5-native: Add initial draft
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-10-23 15:51:25 -02:00