Commit 5b72dda6 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

buildroot: fix fallout after qtopia4 -> qt rename 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 5e93ac89

package/java/classpath/classpath.mk

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ else 
	CLASSPATH_CONF_OPT+= --disable-alsa

endif



ifeq ($(BR2_PACKAGE_QTOPIA4),y)

	CLASSPATH_DEPENDENCIES+= qtopia4

ifeq ($(BR2_PACKAGE_QT),y)

	CLASSPATH_DEPENDENCIES+= qt

	CLASSPATH_CONF_OPT+= --enable-qt-peer

else

	CLASSPATH_CONF_OPT+= --disable-qt-peer

package/java/jamvm/jamvm.mk

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ else 
endif



#Enable or disable qt backend

ifeq ($(BR2_PACKAGE_QTOPIA4),y)

	JAMVM_DEPENDENCIES+= qtopia4

ifeq ($(BR2_PACKAGE_QT),y)

	JAMVM_DEPENDENCIES+= qt

	JAMVM_CONF_OPT+= --enable-qt-peer

else

	JAMVM_CONF_OPT+= --disable-qt-peer

scripts/test/Config.in.test.buildall

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ config BR2_TARGET_TEST_PACKAGES 
	select BR2_PACKAGE_TIFF

	select BR2_PACKAGE_FBV

	select BR2_PACKAGE_FBSET

# BR2_PACKAGE_QTOPIA4 is not set

# BR2_PACKAGE_QT is not set

	select BR2_PACKAGE_XSERVER_none

# BR2_PACKAGE_XSERVER_xorg is not set

# BR2_PACKAGE_XSERVER_tinyx is not set

target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ BR2_PACKAGE_NCURSES=y 
#

# other GUIs

#

# BR2_PACKAGE_QTOPIA4 is not set

# BR2_PACKAGE_QT is not set

BR2_PACKAGE_XSERVER_none=y

# BR2_PACKAGE_XSERVER_xorg is not set

target/device/Atmel/at91rm9200df/at91rm9200df_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ BR2_PACKAGE_NCURSES=y 
#

# other GUIs

#

# BR2_PACKAGE_QTOPIA4 is not set

# BR2_PACKAGE_QT is not set

BR2_PACKAGE_XSERVER_none=y

# BR2_PACKAGE_XSERVER_xorg is not set

# BR2_PACKAGE_XSERVER_tinyx is not set