diff options
Diffstat (limited to 'package/qt')
| -rw-r--r-- | package/qt/Config.in | 24 | ||||
| -rw-r--r-- | package/qt/Config.sql.in | 4 | ||||
| -rw-r--r-- | package/qt/qt.mk | 7 |
3 files changed, 15 insertions, 20 deletions
diff --git a/package/qt/Config.in b/package/qt/Config.in index 9568b7010c..306fe1fc3c 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -120,17 +120,6 @@ config BR2_PACKAGE_QT_CONFIG_FILE This option allows to set the path of such a configuration file, which Buildroot will give to Qt at compile time. -config BR2_PACKAGE_QT_QT_COORD_TYPE_DOUBLE - depends on BR2_SOFT_FLOAT - bool "QT_COORD_TYPE to double" - help - Set QT_COORD_TYPE to double. On ARM-based platforms, qreal - is a typedef for float for performance reasons, but for - QT_COORD_TYPE, some people may want to use a double type - anyway for precision. - - If unsure say n. - config BR2_PACKAGE_QT_QT3SUPPORT bool "Compatibility with Qt3" depends on BR2_PACKAGE_QT_GUI_MODULE @@ -423,11 +412,15 @@ config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \ BR2_microblazebe || BR2_mips || BR2_mipsel || \ (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \ - BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64 + BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || BR2_x86_64 + # The CodeSourcery SuperH toolchain fails to build Webkit, + # with an assertion failure in binutils. + default y if (BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb) && \ + !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209 config BR2_PACKAGE_QT_WEBKIT bool "WebKit Module" + depends on BR2_PACKAGE_QT_SCRIPT depends on BR2_PACKAGE_QT_SHARED depends on BR2_PACKAGE_QT_GUI_MODULE depends on BR2_PACKAGE_QT_NETWORK @@ -437,8 +430,9 @@ config BR2_PACKAGE_QT_WEBKIT Build the WebKit module. If unsure, say n. -comment "WebKit needs shared library/NPTL toolchain/gui/network support" - depends on !(BR2_PACKAGE_QT_SHARED && BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK) +comment "WebKit needs shared library/NPTL toolchain/script/gui/network support" + depends on !(BR2_PACKAGE_QT_SCRIPT && BR2_PACKAGE_QT_SHARED && \ + BR2_PACKAGE_QT_GUI_MODULE && BR2_PACKAGE_QT_NETWORK) depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in index 037837fd62..452edd5133 100644 --- a/package/qt/Config.sql.in +++ b/package/qt/Config.sql.in @@ -31,10 +31,14 @@ config BR2_PACKAGE_QT_ODBC config BR2_PACKAGE_QT_PSQL bool "PostgreSQL Driver" select BR2_PACKAGE_POSTGRESQL + depends on !BR2_STATIC_LIBS help Build PostgreSQL driver If unsure, say n. +comment "PostgreSQL driver needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + choice prompt "SQLite 3 support" default BR2_PACKAGE_QT_SQLITE_NONE diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 919137b2a2..035ca3aacc 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -46,11 +46,6 @@ QT_CFLAGS += -marm QT_CXXFLAGS += -marm endif -ifeq ($(BR2_PACKAGE_QT_QT_COORD_TYPE_DOUBLE),y) -QT_CFLAGS += -DQT_COORD_TYPE=double -QT_CXXFLAGS += -DQT_COORD_TYPE=double -endif - ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y) QT_CONFIGURE_OPTS += -qt3support else @@ -224,6 +219,8 @@ else ifeq ($(BR2_mips)$(BR2_mipsel),y) QT_EMB_PLATFORM = mips else ifeq ($(BR2_powerpc),y) QT_EMB_PLATFORM = powerpc +else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) +QT_EMB_PLATFORM = sh else QT_EMB_PLATFORM = generic endif |
