[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: qt: remove stray -skip configure option

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
4eef0b04 by Johannes Kauffmann at 2022-10-20T10:52:50+00:00
contrib: qt: remove stray -skip configure option

The -skip configure option only works when using the top-level
configure script, when building Qt in one go. Since we don't build the
QtSql module anyway, this can be removed.

It also gets rid of a warning:

WARNING: Command line option -skip is only effective in top-level builds.

- - - - -
90c80642 by Johannes Kauffmann at 2022-10-20T10:52:50+00:00
contrib: qt: remove dedundant configure option

It prints:

Note: Option 'shared' with value 'no' was specified twice

- - - - -
8a2ae7d9 by Johannes Kauffmann at 2022-10-20T10:52:50+00:00
contrib: qt: reorder configure options

In preparation for the next commit.

- - - - -
48ab26d3 by Johannes Kauffmann at 2022-10-20T10:52:50+00:00
contrib: qt: disable more stuff

The sql itemmodel, and certainly the itemmodel tester aren't used, so
don't build these.

- - - - -
8c7ce536 by Johannes Kauffmann at 2022-10-20T10:52:50+00:00
contrib: qt: allow building in debug mode

- - - - -


1 changed file:

- contrib/src/qt/rules.mak


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -96,14 +96,17 @@ QT_PLATFORM += -device-option VLC_EXTRA_CFLAGS="-isystem $(PREFIX)/include" \
 	-device-option VLC_EXTRA_CXXFLAGS="-isystem $(PREFIX)/include" \
 	-device-option VLC_EXTRA_LDFLAGS="-L$(PREFIX)/lib"
 
-QT_CONFIG := -static -no-shared -opensource -confirm-license -no-pkg-config \
-	-no-sql-sqlite -no-gif -no-openssl $(QT_OPENGL) -no-dbus \
-	-no-vulkan -no-sql-odbc -no-pch -no-feature-testlib \
+QT_CONFIG := -static -opensource -confirm-license $(QT_OPENGL) -no-pkg-config \
+	-no-sql-sqlite -no-gif -no-openssl -no-dbus -no-vulkan -no-sql-odbc -no-pch \
+	-no-feature-testlib -no-feature-itemmodeltester -no-feature-sqlmodel \
 	-no-compile-examples -nomake examples -nomake tests \
 	-system-freetype -system-harfbuzz -system-libjpeg -system-libpng -system-zlib
 
-QT_CONFIG += -skip qtsql
+ifdef WITH_OPTIMIZATION
 QT_CONFIG += -release
+else
+QT_CONFIG += -debug
+endif
 
 ifeq ($(V),1)
 QT_CONFIG += -verbose



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c3d55dc14495a338906bca7602581f2b62b8ed50...8c7ce5361fe15b7cbe7c55fc9303569478a0d270

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c3d55dc14495a338906bca7602581f2b62b8ed50...8c7ce5361fe15b7cbe7c55fc9303569478a0d270
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance