diff options
| author | Peter Korsgaard | 2012-02-25 22:52:02 +0100 |
|---|---|---|
| committer | Peter Korsgaard | 2012-02-25 22:52:02 +0100 |
| commit | 24bc2ff8c1d55b13b11faa110dabfb45f73083da (patch) | |
| tree | 1570a62343e7e9e0adc2841c28238ca0146bbab5 /package/qt/qt.mk | |
| parent | sdl_net: bump version, fix tarball name (diff) | |
| download | buildroot-24bc2ff8c1d55b13b11faa110dabfb45f73083da.tar.gz buildroot-24bc2ff8c1d55b13b11faa110dabfb45f73083da.tar.xz buildroot-24bc2ff8c1d55b13b11faa110dabfb45f73083da.zip | |
qt: bump version
Webkit support runs pkg-config at build time, so we need to ensure our
version gets picked up.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/qt/qt.mk')
| -rw-r--r-- | package/qt/qt.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 34f05f925..fe85daebf 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -12,7 +12,7 @@ # ###################################################################### -QT_VERSION = 4.7.4 +QT_VERSION = 4.8.0 QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz QT_SITE = http://get.qt.nokia.com/qt/source QT_DEPENDENCIES = host-pkg-config @@ -59,7 +59,10 @@ endif # ensure glib is built first if enabled for Qt's glib support ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT_CONFIGURE_OPTS += -glib QT_DEPENDENCIES += libglib2 +else +QT_CONFIGURE_OPTS += -no-glib endif @@ -222,9 +225,7 @@ ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y) QT_CONFIGURE_OPTS += -no-gui endif -ifeq ($(BR2_PACKAGE_QT_GIF),y) -QT_CONFIGURE_OPTS += -qt-gif -else +ifneq ($(BR2_PACKAGE_QT_GIF),y) QT_CONFIGURE_OPTS += -no-gif endif @@ -490,9 +491,6 @@ define QT_CONFIGURE_CMDS $(if $(VERBOSE),-verbose,-silent) \ -force-pkg-config \ $(QT_CONFIGURE_OPTS) \ - -no-gfx-qnx \ - -no-kbd-qnx \ - -no-mouse-qnx \ -no-xinerama \ -no-cups \ -no-nis \ @@ -507,7 +505,7 @@ define QT_CONFIGURE_CMDS endef define QT_BUILD_CMDS - $(MAKE) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef |