1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate qtbase tests and src/* for some small fixes

Browse Source 
Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-11-13 13:37:20 +01:00
parent 71c43b035b
commit 5c28fce38e
11 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/bearer/connman/.prev_CMakeLists.txt
View File

@ -22,4 +22,3 @@ add_qt_plugin(qconnmanbearer
#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>: #### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
# OTHER_FILES = "connman.json" # OTHER_FILES = "connman.json"
# _LOADED = "qt_plugin"

1
src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
View File

@ -22,4 +22,3 @@ add_qt_plugin(qnmbearer
#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>: #### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
# OTHER_FILES = "networkmanager.json" # OTHER_FILES = "networkmanager.json"
# _LOADED = "qt_plugin"

1
tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(copier add_qt_executable(copier
GUI
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

1
tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(paster add_qt_executable(paster
GUI
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

1
tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(crashingServer add_qt_executable(crashingServer
GUI
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
SOURCES SOURCES
main.cpp main.cpp

1
tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(desktopsettingsaware add_qt_executable(desktopsettingsaware
GUI
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

1
tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(desktopsettingsaware_helper # special case add_qt_executable(desktopsettingsaware_helper # special case
GUI
SOURCES SOURCES
main.cpp main.cpp
OUTPUT_DIRECTORY # special case OUTPUT_DIRECTORY # special case

1
tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(modal add_qt_executable(modal
GUI
SOURCES SOURCES
base.cpp base.h base.cpp base.h
main.cpp main.cpp

1
tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt
View File

@ -5,7 +5,6 @@
##################################################################### #####################################################################
add_qt_executable(modal_helper # special case add_qt_executable(modal_helper # special case
GUI
SOURCES SOURCES
base.cpp base.h base.cpp base.h
main.cpp main.cpp

1
tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt
View File

@ -11,7 +11,6 @@ add_qt_benchmark(qtimer_vs_qmetaobject
. .
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Test Qt::Test
Threads::Threads
) )
#### Keys ignored in scope 1:.:.:qtimer_vs_qmetaobject.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qtimer_vs_qmetaobject.pro:<TRUE>:

24
tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt
View File

@ -16,18 +16,6 @@ add_qt_benchmark(tst_bench_qgraphicsview
) )
# Resources: # Resources:
set(images_resource_files
"qt4logo.png"
)
add_qt_resource(tst_bench_qgraphicsview "images"
PREFIX
"/"
BASE
"chiptester"
FILES
${images_resource_files}
)
set(qgraphicsview_resource_files set(qgraphicsview_resource_files
"images/designer.png" "images/designer.png"
"images/wine-big.jpeg" "images/wine-big.jpeg"
@ -41,6 +29,18 @@ add_qt_resource(tst_bench_qgraphicsview "qgraphicsview"
FILES FILES
${qgraphicsview_resource_files} ${qgraphicsview_resource_files}
) )
set(images_resource_files
"qt4logo.png"
)
add_qt_resource(tst_bench_qgraphicsview "images"
PREFIX
"/"
BASE
"chiptester"
FILES
${images_resource_files}
)
#### Keys ignored in scope 1:.:.:qgraphicsview.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qgraphicsview.pro:<TRUE>: