AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Regenerate projects using pro2cmake one last time

Browse Source 
And fix up some wrong qmake project files

Pick-to: 6.0
Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-12-09 14:59:40 +01:00
parent b94b7687b0
commit 2304acab5f
35 changed files with 193 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/.prev_CMakeLists.txt
View File

@ -98,6 +98,7 @@ qt_internal_add_tool(${target_name}
../src/corelib/tools/qarraydatapointer.h
../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h
../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h
../src/corelib/tools/qduplicatetracker_p.h
../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h
../src/corelib/tools/qlist.h
../src/corelib/tools/qmap.h

1
src/3rdparty/freetype/CMakeLists.txt vendored
View File

@ -61,6 +61,7 @@ qt_disable_warnings(BundledFreetype)
qt_set_symbol_visibility_hidden(BundledFreetype)
#### Keys ignored in scope 1:.:.:freetype.pro:<TRUE>:
# MODULE_EXT_HEADERS_DIR = "$$PWD/include"
# OTHER_FILES = "$$PWD/src/autofit/afangles.c" "$$PWD/src/autofit/afglobal.c" "$$PWD/src/autofit/afloader.c" "$$PWD/src/autofit/afmodule.c"
# QT_FOR_CONFIG = "gui-private"

1
src/3rdparty/libpng/CMakeLists.txt vendored
View File

@ -34,6 +34,7 @@ qt_disable_warnings(BundledLibpng)
qt_set_symbol_visibility_hidden(BundledLibpng)
#### Keys ignored in scope 1:.:.:libpng.pro:<TRUE>:
# MODULE_EXT_HEADERS = "png.h" "pngconf.h"
# TR_EXCLUDE = "$$PWD/*"
## Scopes:

2
src/corelib/.prev_CMakeLists.txt
View File

@ -10,6 +10,7 @@ qt_internal_add_module(Core
EXCEPTIONS
SOURCES
global/archdetect.cpp
global/qcompare.h
global/qcompilerdetection.h
global/qcontainerinfo.h
global/qendian.cpp global/qendian.h global/qendian_p.h
@ -346,7 +347,6 @@ qt_internal_extend_target(Core CONDITION WIN32
kernel/qwineventnotifier.cpp kernel/qwineventnotifier.h kernel/qwineventnotifier_p.h
kernel/qwinregistry.cpp kernel/qwinregistry_p.h
plugin/qsystemlibrary.cpp plugin/qsystemlibrary_p.h
thread/qatomic_msvc.h
thread/qthread_win.cpp
DEFINES
-QT_NO_CAST_TO_ASCII

2
tests/auto/.prev_CMakeLists.txt
View File

@ -14,7 +14,7 @@ endif()
if(TARGET Qt::Concurrent)
add_subdirectory(concurrent)
endif()
if((((system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt))))
if((((QT_FEATURE_dbus_linked) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt) AND ((TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt) AND (NOT (system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1"))))) OR ((system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt))))
add_subdirectory(dbus)
endif()
if(TARGET Qt::Network)

2
tests/auto/concurrent/CMakeLists.txt
View File

@ -1,8 +1,8 @@
# Generated from concurrent.pro.
add_subdirectory(qtconcurrentfilter)
add_subdirectory(qtconcurrentfiltermapgenerated)
add_subdirectory(qtconcurrentiteratekernel)
add_subdirectory(qtconcurrentfiltermapgenerated)
add_subdirectory(qtconcurrentmap)
add_subdirectory(qtconcurrentmedian)
add_subdirectory(qtconcurrentrun)

5
tests/auto/concurrent/qtconcurrentfiltermapgenerated/CMakeLists.txt
View File

@ -1,12 +1,13 @@
# Generated from qtconcurrentfiltermapgenerated.pro.
#####################################################################
## tst_qtconcurrentfiltermapgenerated Test:
#####################################################################
qt_internal_add_test(tst_qtconcurrentfiltermapgenerated
SOURCES
tst_qtconcurrentfiltermapgenerated.cpp
tst_qtconcurrentfiltermapgenerated.h
tst_qtconcurrent_selected_tests.cpp
tst_qtconcurrentfiltermapgenerated.cpp tst_qtconcurrentfiltermapgenerated.h
PUBLIC_LIBRARIES
Qt::Concurrent
)

1
tests/auto/corelib/global/qlogging/.prev_CMakeLists.txt
View File

@ -2,3 +2,4 @@
add_subdirectory(app)
add_subdirectory(test)
add_subdirectory(test_qmessagelogger)

13
tests/auto/corelib/global/qlogging/CMakeLists.txt
View File

@ -1,29 +1,28 @@
# Generated from qlogging.pro.
# This file is almost completely custom written # special case
# This file is almost completely custom written
# special case skip regeneration
qt_internal_add_executable(qlogging_helper
NO_INSTALL # special case
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
NO_INSTALL
OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES app/main.cpp
DEFINES QT_MESSAGELOGCONTEXT
LIBRARIES Qt::Core)
# special case begin
# Fixes required for the backtrace stack to be correct
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND NOT MINGW)
target_link_options(qlogging_helper PRIVATE -rdynamic)
endif()
set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default)
# special case end
qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp
DEFINES
QT_MESSAGELOGCONTEXT
QT_DISABLE_DEPRECATED_BEFORE=0
HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper" # special case
HELPER_BINARY="${CMAKE_CURRENT_BINARY_DIR}/qlogging_helper"
)
target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # special case # to fix the binary name
target_compile_definitions(tst_qlogging PRIVATE QT_CMAKE_BUILD) # to fix the binary name
qt_internal_add_test(tst_qmessagelogger SOURCES tst_qmessagelogger.cpp
DEFINES

4
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
View File

@ -17,7 +17,7 @@ qt_internal_add_test(tst_qmimedatabase-cache
)
# Resources:
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qmimedatabase-cache "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
"/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)

4
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
View File

@ -17,7 +17,7 @@ qt_internal_add_test(tst_qmimedatabase-xml
)
# Resources:
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
@ -28,7 +28,7 @@ qt_internal_add_resource(tst_qmimedatabase-xml "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
"/Volumes/T3/Dev/qt/qt5_cmake/worktrees/dev/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)

17
tests/auto/corelib/serialization/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
# Generated from serialization.pro.
add_subdirectory(json)
add_subdirectory(qcborstreamreader)
add_subdirectory(qcborstreamwriter)
add_subdirectory(qcborvalue)
add_subdirectory(qcborvalue_json)
if(TARGET Qt::Gui)
add_subdirectory(qdatastream)
add_subdirectory(qdatastream_core_pixmap)
endif()
if(TARGET Qt::Network)
add_subdirectory(qtextstream)
endif()
if(TARGET Qt::Network AND TARGET Qt::Xml AND NOT ANDROID)
add_subdirectory(qxmlstream)
endif()

8
tests/auto/corelib/text/.prev_CMakeLists.txt
View File

@ -1,20 +1,26 @@
# Generated from text.pro.
add_subdirectory(qbytearray)
add_subdirectory(qbytearrayapisymmetry)
add_subdirectory(qbytearraylist)
add_subdirectory(qbytearraymatcher)
add_subdirectory(qbytearrayview)
add_subdirectory(qbytedatabuffer)
add_subdirectory(qchar)
add_subdirectory(qcollator)
add_subdirectory(qlatin1string)
add_subdirectory(qlocale)
add_subdirectory(qregularexpression)
add_subdirectory(qstring)
add_subdirectory(qstring_no_cast_from_bytearray)
add_subdirectory(qstringapisymmetry)
add_subdirectory(qstringbuilder)
add_subdirectory(qstringconverter)
add_subdirectory(qstringiterator)
add_subdirectory(qstringlist)
add_subdirectory(qstringmatcher)
add_subdirectory(qstringtokenizer)
add_subdirectory(qstringview)
add_subdirectory(qtextboundaryfinder)
if(NOT ANDROID)
add_subdirectory(qlocale)
endif()

2
tests/auto/corelib/time/qdatetimeparser/CMakeLists.txt
View File

@ -1,3 +1,5 @@
# Generated from qdatetimeparser.pro.
#####################################################################
## tst_qdatetimeparser Test:
#####################################################################

3
tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
View File

@ -8,3 +8,6 @@ qt_internal_add_test(tst_containerapisymmetry
SOURCES
tst_containerapisymmetry.cpp
)
## Scopes:
#####################################################################

19
tests/auto/gui/image/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
# Generated from image.pro.
if(TARGET Qt::Network AND NOT ANDROID)
add_subdirectory(qimagereader)
endif()
add_subdirectory(qicoimageformat)
add_subdirectory(qpixmap)
add_subdirectory(qimage)
add_subdirectory(qimageiohandler)
add_subdirectory(qimagewriter)
add_subdirectory(qmovie)
add_subdirectory(qpicture)
add_subdirectory(qiconhighdpi)
if(QT_FEATURE_private_tests)
add_subdirectory(qpixmapcache)
endif()
if(NOT ANDROID)
add_subdirectory(qicon)
endif()

4
tests/auto/gui/kernel/.prev_CMakeLists.txt
View File

@ -11,6 +11,7 @@ add_subdirectory(qevent)
add_subdirectory(qfileopenevent)
add_subdirectory(qguieventdispatcher)
add_subdirectory(qguitimer)
add_subdirectory(qhighdpi)
add_subdirectory(qinputdevice)
add_subdirectory(qinputmethod)
add_subdirectory(qkeyevent)
@ -35,9 +36,6 @@ if(QT_FEATURE_shortcut)
add_subdirectory(qkeysequence)
add_subdirectory(qshortcut)
endif()
if(QT_FEATURE_highdpiscaling)
add_subdirectory(qhighdpiscaling)
endif()
if(TARGET Qt::Widgets)
add_subdirectory(qmouseevent_modal)
add_subdirectory(qtouchevent)

4
tests/auto/gui/kernel/CMakeLists.txt
View File

@ -11,6 +11,7 @@ add_subdirectory(qevent)
add_subdirectory(qfileopenevent)
add_subdirectory(qguieventdispatcher)
add_subdirectory(qguitimer)
add_subdirectory(qhighdpi)
add_subdirectory(qinputdevice)
add_subdirectory(qinputmethod)
add_subdirectory(qkeyevent)
@ -35,9 +36,6 @@ if(QT_FEATURE_shortcut)
add_subdirectory(qkeysequence)
add_subdirectory(qshortcut)
endif()
if(QT_FEATURE_highdpiscaling)
add_subdirectory(qhighdpi)
endif()
if(TARGET Qt::Widgets)
add_subdirectory(qmouseevent_modal)
add_subdirectory(qtouchevent)

2
tests/auto/gui/kernel/kernel.pro
View File

@ -51,8 +51,6 @@ win32:qtHaveModule(network): SUBDIRS += noqteventloop
qaction \
qactiongroup
!qtConfig(highdpiscaling): SUBDIRS -= qhighdpiscaling
!qtConfig(opengl): SUBDIRS -= qopenglwindow
android|uikit: SUBDIRS -= qclipboard

14
tests/auto/gui/kernel/qhighdpiscaling/CMakeLists.txt
View File

@ -1,14 +0,0 @@
# Generated from qhighdpiscaling.pro.
#####################################################################
## tst_qhighdpiscaling Test:
#####################################################################
qt_internal_add_test(tst_qhighdpiscaling
SOURCES
tst_qhighdpiscaling.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Gui
Qt::GuiPrivate
)

22
tests/auto/gui/painting/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,22 @@
# Generated from painting.pro.
add_subdirectory(qpainterpath)
add_subdirectory(qpainterpathstroker)
add_subdirectory(qcolor)
add_subdirectory(qbrush)
add_subdirectory(qregion)
add_subdirectory(qpagelayout)
add_subdirectory(qpageranges)
add_subdirectory(qpagesize)
add_subdirectory(qpainter)
add_subdirectory(qpdfwriter)
add_subdirectory(qpen)
add_subdirectory(qpaintengine)
add_subdirectory(qtransform)
add_subdirectory(qpolygon)
if(NOT ANDROID)
add_subdirectory(qcolorspace)
endif()
if(QT_FEATURE_private_tests)
add_subdirectory(qpathclipper)
endif()

12
tests/auto/network/kernel/CMakeLists.txt
View File

@ -1,14 +1,16 @@
# Generated from kernel.pro.
add_subdirectory(qdnslookup)
add_subdirectory(qdnslookup_appless)
add_subdirectory(qnetworkproxyfactory)
add_subdirectory(qnetworkproxy)
add_subdirectory(qnetworkinterface)
add_subdirectory(qnetworkdatagram)
add_subdirectory(qnetworkaddressentry)
add_subdirectory(qhostaddress)
if(QT_FEATURE_private_tests)
add_subdirectory(qauthenticator)
if(NOT MACOS)
if(QT_FEATURE_private_tests AND NOT MACOS)
add_subdirectory(qhostinfo)
endif()
if(QT_FEATURE_private_tests)
add_subdirectory(qauthenticator)
endif()

8
tests/auto/network/kernel/kernel.pro
View File

@ -9,12 +9,12 @@ SUBDIRS=\
qnetworkinterface \
qnetworkdatagram \
qnetworkaddressentry \
qhostaddress \
qhostaddress
osx: SUBDIRS -= \ # QTBUG-41847
qhostinfo \
# QTBUG-41847
osx: SUBDIRS -= qhostinfo
!qtConfig(private_tests): SUBDIRS -= \
qauthenticator \
qhostinfo \
qhostinfo

4
tests/auto/network/socket/qlocalsocket/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
# Generated from qlocalsocket.pro.
add_subdirectory(test)
add_subdirectory(socketprocess)

5
tests/auto/network/socket/qlocalsocket/CMakeLists.txt
View File

@ -1,6 +1,7 @@
# special case begin
add_subdirectory(socketprocess)
# Generated from qlocalsocket.pro.
# add_subdirectory(test) # special case remove
add_subdirectory(socketprocess)
qt_internal_add_test(tst_qlocalsocket
SOURCES
tst_qlocalsocket.cpp

19
tests/auto/other/android/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
# Generated from android.pro.
#####################################################################
## tst_android Test:
#####################################################################
qt_internal_add_test(tst_android
SOURCES
tst_android.cpp
)
if(ANDROID)
set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
${CMAKE_CURRENT_SOURCE_DIR}/testdata
)
endif()
#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
# DISTFILES = "testdata/assets/test.txt"

16
tests/auto/other/networkselftest/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,16 @@
# Generated from networkselftest.pro.
#####################################################################
## tst_networkselftest Test:
#####################################################################
qt_internal_add_test(tst_networkselftest
SOURCES
tst_networkselftest.cpp
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Network
)
#### Keys ignored in scope 1:.:.:networkselftest.pro:<TRUE>:
# QT_TEST_SERVER_LIST = "cyrus" "vsftpd" "apache2" "ftp-proxy" "danted" "squid" "echo"

5
tests/auto/other/networkselftest/CMakeLists.txt
View File

@ -10,5 +10,8 @@ qt_internal_add_test(tst_networkselftest
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::Network
QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "cyrus" "echo"
QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "cyrus" "echo" # special case
)
#### Keys ignored in scope 1:.:.:networkselftest.pro:<TRUE>:
# QT_TEST_SERVER_LIST = "cyrus" "vsftpd" "apache2" "ftp-proxy" "danted" "squid" "echo"

4
tests/auto/tools/.prev_CMakeLists.txt
View File

@ -1,10 +1,12 @@
# Generated from tools.pro.
if(NOT ANDROID AND NOT IOS)
add_subdirectory(qmakelib)
add_subdirectory(qmake)
add_subdirectory(moc)
add_subdirectory(rcc)
if(TARGET Qt::Widgets)
endif()
if(TARGET Qt::Widgets AND NOT ANDROID AND NOT IOS)
add_subdirectory(uic)
endif()
if(TARGET Qt::DBus)

28
tests/auto/widgets/kernel/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,28 @@
# Generated from kernel.pro.
add_subdirectory(qapplication)
add_subdirectory(qboxlayout)
add_subdirectory(qformlayout)
add_subdirectory(qgridlayout)
add_subdirectory(qlayout)
add_subdirectory(qstackedlayout)
add_subdirectory(qtooltip)
add_subdirectory(qwidget_window)
add_subdirectory(qwidgetmetatype)
add_subdirectory(qwidgetsvariant)
add_subdirectory(qwindowcontainer)
add_subdirectory(qsizepolicy)
if(NOT APPLE)
add_subdirectory(qgesturerecognizer)
endif()
if(NOT ANDROID)
add_subdirectory(qwidget)
endif()
if(QT_FEATURE_shortcut)
add_subdirectory(qshortcut)
endif()
if(QT_FEATURE_action)
add_subdirectory(qaction)
add_subdirectory(qactiongroup)
add_subdirectory(qwidgetaction)
endif()

5
tests/auto/xml/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,5 @@
# Generated from xml.pro.
if(NOT ANDROID)
add_subdirectory(dom)
endif()

2
tests/benchmarks/corelib/kernel/CMakeLists.txt
View File

@ -9,6 +9,6 @@ if(TARGET Qt::Widgets)
add_subdirectory(qmetaobject)
add_subdirectory(qobject)
endif()
if(win32_x_)
if(WIN32)
add_subdirectory(qwineventnotifier)
endif()

2
tests/benchmarks/corelib/kernel/qwineventnotifier/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## tst_bench_qwineventnotifier Binary:
#####################################################################
qt_add_benchmark(tst_bench_qwineventnotifier
qt_internal_add_benchmark(tst_bench_qwineventnotifier
SOURCES
main.cpp
PUBLIC_LIBRARIES

2
tests/manual/diaglib/diaglib.pri
View File

@ -12,7 +12,7 @@ HEADERS += \
win32: {
SOURCES += $$PWD/nativewindowdump_win.cpp
QMAKE_LIBS += -luser32
LIBS += -luser32
} else {
SOURCES += $$PWD/nativewindowdump.cpp
}

2
tests/manual/qtabletevent/regular_widgets/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## regular_widgets Binary:
#####################################################################
qt_internal_add_executable(regular_widgets
qt_internal_add_manual_test(regular_widgets
GUI
SOURCES
main.cpp