Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt 6.0.1 #4412

Merged
merged 36 commits into from
Feb 23, 2021
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8d1c6f1
qt 6
ericLemanissier Jan 29, 2021
0f12f4c
add qt6 sources
ericLemanissier Jan 29, 2021
54c00ff
disable double-conversion
ericLemanissier Jan 29, 2021
7cb654b
remove opengl es2 (does not exist any more)
ericLemanissier Jan 29, 2021
53cb70e
remove iconv (was commented anyway)
ericLemanissier Jan 29, 2021
c448bd1
implement cmake
ericLemanissier Jan 29, 2021
1a2b186
disable mysql by default
ericLemanissier Jan 29, 2021
551575c
workaround QTBUG-87718
ericLemanissier Jan 29, 2021
73a209b
fix tests
ericLemanissier Jan 29, 2021
1702491
fix QTBUG-89201
ericLemanissier Jan 29, 2021
1cad05d
disable libjpeg and zstd by default
ericLemanissier Jan 29, 2021
39160ab
raise exceptions on non supported platfoms
ericLemanissier Jan 29, 2021
0c36638
remove qt5 leftover
ericLemanissier Jan 29, 2021
8ba0a69
disable glib on non-linux
ericLemanissier Jan 29, 2021
4e6406f
require xorg on freebsd too
ericLemanissier Jan 29, 2021
61d69e1
fixup folders
ericLemanissier Jan 29, 2021
564b25e
use options.get_safe
ericLemanissier Jan 29, 2021
54b3478
add pkgconf build requirement
ericLemanissier Jan 29, 2021
a360934
use strawberryperl on msvc
ericLemanissier Jan 29, 2021
b86f5af
msvc: try Zc:-Zc:twoPhase
ericLemanissier Feb 1, 2021
23fe2ee
remove pdb files in all subfolders
ericLemanissier Feb 1, 2021
f64fdc2
handle opengl, zstd and vulkan
ericLemanissier Feb 3, 2021
883ef65
use conan's vulkan package
ericLemanissier Feb 3, 2021
d04d77f
remove qtqa and qtrepotools
ericLemanissier Feb 3, 2021
e865c80
qt 6.0.1
ericLemanissier Feb 3, 2021
32a29e0
move zlib requirement to method
ericLemanissier Feb 10, 2021
aa3cddf
enable doubleconversion
ericLemanissier Feb 10, 2021
fad8364
add some comments regarding no_copy_source
ericLemanissier Feb 10, 2021
e9066cd
remove unused import
ericLemanissier Feb 11, 2021
129f43d
use conan provided cmake instead of the one from visual studio
ericLemanissier Feb 11, 2021
d479211
Don't require opengl on windows
ericLemanissier Feb 11, 2021
f46140f
don't use jom for test recipe
ericLemanissier Feb 11, 2021
b16becf
set CC and CXX variables on Visual Studio
ericLemanissier Feb 11, 2021
01c93e4
fixup comments
ericLemanissier Feb 11, 2021
746a989
fixup CC/CXX env vars usage in test recipe
ericLemanissier Feb 12, 2021
b9e0fc3
remove commercial option
ericLemanissier Feb 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions recipes/qt/6.x.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sources:
"6.0.1":
url:
- "https://download.qt.io/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.0/6.0.1/single/qt-everywhere-src-6.0.1.tar.xz"
sha256: "d13cfac103cd80b216cd2f73d0211dd6b1a1de2516911c89ce9c5ed14d9631a8"
550 changes: 550 additions & 0 deletions recipes/qt/6.x.x/conanfile.py

Large diffs are not rendered by default.

325 changes: 325 additions & 0 deletions recipes/qt/6.x.x/qtmodules6.0.1.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,325 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 6.0
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 6.0
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 6.0
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = dev
status = ignore
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = dev
status = ignore
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 6.0
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = dev
status = ignore
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 6.0
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative qttools
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 6.0
status = essential
priority = 40
[submodule "qtrepotools"]
path = qtrepotools
url = ../qtrepotools.git
branch = master
status = essential
project = -
[submodule "qtqa"]
depends = qtbase
path = qtqa
url = ../qtqa.git
branch = dev
status = essential
priority = 50
[submodule "qtlocation"]
depends = qtbase
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = dev
status = ignore
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = dev
status = ignore
[submodule "qtsystems"]
depends = qtbase
recommends = qtdeclarative
path = qtsystems
url = ../qtsystems.git
branch = dev
status = ignore
[submodule "qtfeedback"]
depends = qtdeclarative
recommends = qtmultimedia
path = qtfeedback
url = ../qtfeedback.git
branch = master
status = ignore
[submodule "qtpim"]
depends = qtdeclarative
path = qtpim
url = ../qtpim.git
branch = dev
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = dev
status = ignore
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 6.0
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = dev
status = ignore
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = dev
status = ignore
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = dev
status = ignore
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = dev
status = ignore
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = dev
status = ignore
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = dev
status = ignore
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = dev
status = ignore
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = dev
status = ignore
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = dev
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = dev
status = ignore
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = dev
status = ignore
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = dev
status = ignore
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = dev
status = ignore
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = dev
status = ignore
[submodule "qtquickcontrols2"]
depends = qtdeclarative
recommends = qtimageformats qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 6.0
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = dev
status = ignore
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = dev
status = ignore
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = dev
status = ignore
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = dev
status = ignore
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = dev
status = ignore
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = dev
status = ignore
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = dev
status = ignore
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = dev
status = ignore
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = dev
status = ignore
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = dev
status = ignore
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = dev
status = ignore
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.0
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
path = qtquick3d
url = ../qtquick3d.git
branch = 6.0
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.0
status = addon
[submodule "qt5compat"]
depends = qtbase
path = qt5compat
url = ../qt5compat.git
branch = 6.0
status = deprecated
18 changes: 18 additions & 0 deletions recipes/qt/6.x.x/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
cmake_minimum_required(VERSION 3.1.0)

set(CMAKE_CXX_STANDARD 17)

project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_set_vs_runtime()
conan_set_libcxx()
conan_output_dirs_setup()

find_package(qt REQUIRED CONFIG)

add_executable(${PROJECT_NAME} test_package.cpp greeter.h moc_greeter.cpp)
# Must compile with "-fPIC" since Qt was built with -reduce-relocations.
target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)

target_link_libraries(${PROJECT_NAME} qt::qt)
Loading