diff options
| author | Adam Duskett <Aduskett@gmail.com> | 2017-04-22 13:18:03 -0400 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-05-02 14:34:19 +0200 |
| commit | cf1c12bdba037b4e28e2d7fcef0e653a45016408 (patch) | |
| tree | 576e6f840e3c3d60772dd2f43421c48014f8f7c0 /package/qt5 | |
| parent | 0d18d1d9c0dd8173eee918b30761548c19b6bfdc (diff) | |
| download | buildroot-cf1c12bdba037b4e28e2d7fcef0e653a45016408.tar.gz buildroot-cf1c12bdba037b4e28e2d7fcef0e653a45016408.zip | |
package/q*/Config.in: fix ordering of statements
The check-package script when ran gives warnings on ordering issues
on all of these Config files. This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter q in the package directory.
The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.
Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt53d/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5base/Config.in | 10 | ||||
| -rw-r--r-- | package/qt5/qt5canvas3d/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5connectivity/Config.in | 2 | ||||
| -rw-r--r-- | package/qt5/qt5declarative/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5graphicaleffects/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5quickcontrols/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5quickcontrols2/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5script/Config.in | 2 | ||||
| -rw-r--r-- | package/qt5/qt5webkit/Config.in | 10 | ||||
| -rw-r--r-- | package/qt5/qt5x11extras/Config.in | 2 |
12 files changed, 27 insertions, 27 deletions
diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 626e9b214d..04dccea1fc 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -1,15 +1,15 @@ config BR2_PACKAGE_QT5_GL_AVAILABLE bool - depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES config BR2_PACKAGE_QT5_JSCORE_AVAILABLE bool + default y # Javascript engine is only available on certain architectures depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 - default y comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" depends on !BR2_PACKAGE_QT diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in index 27f27a8070..f776da2c87 100644 --- a/package/qt5/qt53d/Config.in +++ b/package/qt5/qt53d/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_QT53D bool "qt53d" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 4796fdb058..5d1ff1339c 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -61,19 +61,19 @@ config BR2_PACKAGE_QT5BASE_SQL if BR2_PACKAGE_QT5BASE_SQL config BR2_PACKAGE_QT5BASE_MYSQL bool "MySQL Plugin" + depends on BR2_USE_MMU # mysql select BR2_PACKAGE_MYSQL select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE - depends on BR2_USE_MMU # mysql help Build MySQL plugin If unsure, say n. config BR2_PACKAGE_QT5BASE_PSQL bool "PostgreSQL Plugin" - select BR2_PACKAGE_POSTGRESQL depends on BR2_USE_MMU # postgresql depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_POSTGRESQL help Build PostgreSQL plugin If unsure, say n. @@ -198,9 +198,9 @@ comment "X.org XCB backend available if X.org is enabled" config BR2_PACKAGE_QT5BASE_EGLFS bool "eglfs support" - select BR2_PACKAGE_QT5BASE_OPENGL depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_QT5_GL_AVAILABLE + select BR2_PACKAGE_QT5BASE_OPENGL comment "eglfs backend available if OpenGL and EGL are enabled" depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT5_GL_AVAILABLE @@ -250,16 +250,16 @@ endif config BR2_PACKAGE_QT5BASE_DBUS bool "DBus module" - select BR2_PACKAGE_DBUS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU + select BR2_PACKAGE_DBUS help This option enables the D-Bus module. config BR2_PACKAGE_QT5BASE_ICU bool "Enable ICU support" - select BR2_PACKAGE_ICU depends on !BR2_BINFMT_FLAT # icu + select BR2_PACKAGE_ICU help This option enables ICU support in Qt5. This is for example needed for Qt5Webkit. diff --git a/package/qt5/qt5canvas3d/Config.in b/package/qt5/qt5canvas3d/Config.in index 8058a2e25f..04c04730bd 100644 --- a/package/qt5/qt5canvas3d/Config.in +++ b/package/qt5/qt5canvas3d/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QT5CANVAS3D bool "qt5canvas3d" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK depends on BR2_PACKAGE_QT5_GL_AVAILABLE depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index 8903fc9496..8bda8de66a 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QT5CONNECTIVITY bool "qt5connectivity" + depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS - depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 853322cab3..5384b5f187 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QT5DECLARATIVE bool "qt5declarative" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE select BR2_PACKAGE_QT5XMLPATTERNS select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_GUI - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for developers using C++. @@ -21,7 +21,7 @@ comment "quick module needs an OpenGL-capable backend" config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL depends on BR2_PACKAGE_QT5_GL_AVAILABLE + select BR2_PACKAGE_QT5BASE_OPENGL endif diff --git a/package/qt5/qt5graphicaleffects/Config.in b/package/qt5/qt5graphicaleffects/Config.in index df23425975..69b7fca413 100644 --- a/package/qt5/qt5graphicaleffects/Config.in +++ b/package/qt5/qt5graphicaleffects/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QT5GRAPHICALEFFECTS bool "qt5graphicaleffects" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK depends on BR2_PACKAGE_QT5_GL_AVAILABLE depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 3ab6ded403..3cc5821b1e 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK depends on BR2_PACKAGE_QT5_GL_AVAILABLE depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index adf89d0de7..1066b173bd 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5script/Config.in b/package/qt5/qt5script/Config.in index ad19727ac2..034b7d2fcb 100644 --- a/package/qt5/qt5script/Config.in +++ b/package/qt5/qt5script/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_QT5SCRIPT bool "qt5script" - select BR2_PACKAGE_QT5BASE depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + select BR2_PACKAGE_QT5BASE help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 2534360459..637996a0de 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -1,16 +1,16 @@ config BR2_PACKAGE_QT5WEBKIT bool "qt5webkit" + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + depends on !BR2_BINFMT_FLAT # icu + # assumes a FPU is available on MIPS + depends on !BR2_MIPS_SOFT_FLOAT select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_BINFMT_FLAT # icu - # assumes a FPU is available on MIPS - depends on !BR2_MIPS_SOFT_FLOAT help Qt is a cross-platform application and UI framework for developers using C++. diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in index 9c514cdd03..ff4cc11531 100644 --- a/package/qt5/qt5x11extras/Config.in +++ b/package/qt5/qt5x11extras/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_QT5X11EXTRAS bool "qt5x11extras" - select BR2_PACKAGE_QT5BASE_WIDGETS depends on BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_QT5BASE_WIDGETS help Qt is a cross-platform application and UI framework for developers using C++. |

