diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-12-16 12:02:30 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-12-20 10:00:05 +0000 |
| commit | 68e15e613f4e3a20a055ad8a1ad0806c742d0770 (patch) | |
| tree | 4d3d4dfee4fe5d56af61099bba3c19d13fde948b /tests | |
| parent | c83e66d45f41dbcc340658c0052f9ead8aef3512 (diff) | |
| download | qt-creator-68e15e613f4e3a20a055ad8a1ad0806c742d0770.tar.gz | |
Remove unneeded .pro/.pri files
Remove qtcreator(_ide_branding).pri, and all remaining .pro/.pri
files that depend on it.
They have CMake files now.
Change-Id: I87d100b49df7ca95694a755cb581cb5eea26aa9a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'tests')
25 files changed, 0 insertions, 330 deletions
diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri deleted file mode 100644 index 731d98718d..0000000000 --- a/tests/auto/qttest.pri +++ /dev/null @@ -1,18 +0,0 @@ -include(../../qtcreator.pri) -include(qttestrpath.pri) - -isEmpty(TEMPLATE):TEMPLATE=app -QT += testlib -CONFIG += qt warn_on console depend_includepath testcase -CONFIG -= app_bundle - -DEFINES -= QT_RESTRICTED_CAST_FROM_ASCII -# prefix test binary with tst_ -!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") - -win32 { - lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH - lib ~= s,/,\\,g - # the below gets added to later by testcase.prf - check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c -} diff --git a/tests/auto/qttestrpath.pri b/tests/auto/qttestrpath.pri deleted file mode 100644 index d69f084db0..0000000000 --- a/tests/auto/qttestrpath.pri +++ /dev/null @@ -1,11 +0,0 @@ -linux-* { - QMAKE_RPATHDIR += $$IDE_LIBRARY_PATH - QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH - - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' -} else:macx { - QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_LIBRARY_PATH\",-rpath,\"$$IDE_PLUGIN_PATH\" -} - diff --git a/tests/auto/valgrind/callgrind/modeltest.pro b/tests/auto/valgrind/callgrind/modeltest.pro deleted file mode 100644 index 647043c513..0000000000 --- a/tests/auto/valgrind/callgrind/modeltest.pro +++ /dev/null @@ -1,36 +0,0 @@ -include(../../../qtcreator.pri) -include(../../auto/qttestrpath.pri) -include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) -include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri) - -TEMPLATE = app -TARGET = modeltest - -macx:CONFIG -= app_bundle - - -SRCDIR = $$IDE_SOURCE_TREE/src - -SOURCES += \ - modeltest.cpp \ - $$SRCDIR/plugins/valgrind/callgrindcostdelegate.cpp \ - $$SRCDIR/plugins/valgrind/callgrindhelper.cpp \ - $$SRCDIR/plugins/valgrind/callgrindcostview.cpp \ - $$SRCDIR/plugins/valgrind/callgrindnamedelegate.cpp \ - $$SRCDIR/plugins/valgrind/callgrindwidgethandler.cpp \ - $$SRCDIR/plugins/valgrind/callgrindvisualisation.cpp \ - -HEADERS += \ - modeltest.h \ - $$SRCDIR/plugins/valgrind/callgrindcostdelegate.h \ - $$SRCDIR/plugins/valgrind/callgrindcostview.h \ - $$SRCDIR/plugins/valgrind/callgrindhelper.h \ - $$SRCDIR/plugins/valgrind/callgrindnamedelegate.h \ - $$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \ - $$SRCDIR/plugins/valgrind/callgrindvisualisation.h \ - -LIBS *= -L$$IDE_PLUGIN_PATH - -INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin # for ide_version.h - -DEFINES += "DISABLE_CALLGRIND_WORKAROUNDS" diff --git a/tests/auto/valgrind/memcheck/memcheck.pro b/tests/auto/valgrind/memcheck/memcheck.pro deleted file mode 100644 index ca8134e626..0000000000 --- a/tests/auto/valgrind/memcheck/memcheck.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = subdirs - -# avoid race conditions when compiling shadowbuild and having more than one compile job -modeldemo.file = modeldemo.pro -testapps.depends = modeldemo - -SUBDIRS += modeldemo testapps - - diff --git a/tests/auto/valgrind/memcheck/modeldemo.pro b/tests/auto/valgrind/memcheck/modeldemo.pro deleted file mode 100644 index 2053b6e38d..0000000000 --- a/tests/auto/valgrind/memcheck/modeldemo.pro +++ /dev/null @@ -1,19 +0,0 @@ -QTC_LIB_DEPENDS += utils ssh -QTC_PLUGIN_DEPENDS += debugger projectexplorer -include(../../../../qtcreator.pri) -include(../../qttestrpath.pri) -include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) - -TEMPLATE = app -TARGET = modeldemo - -macx:CONFIG -= app_bundle - -QT += gui network - -DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" -DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\"" - -SOURCES += modeldemo.cpp - -HEADERS += modeldemo.h diff --git a/tests/auto/valgrind/memcheck/testapps/free1/free1.pro b/tests/auto/valgrind/memcheck/testapps/free1/free1.pro deleted file mode 100644 index 3cb12e203a..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/free1/free1.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = free1 - -CONFIG += debug console -CONFIG -= qt - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/free2/free2.pro b/tests/auto/valgrind/memcheck/testapps/free2/free2.pro deleted file mode 100644 index ae2f024fac..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/free2/free2.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = free2 - -CONFIG += debug console -CONFIG -= qt - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro b/tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro deleted file mode 100644 index 143331dc46..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -TARGET = invalidjump - -CONFIG += debug console -CONFIG -= qt - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro b/tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro deleted file mode 100644 index 19710fb3da..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app -TARGET = leak1 - -CONFIG += debug - -QT += core - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro deleted file mode 100644 index 7e2902b0d1..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = leak2 - -CONFIG += debug - -msvc: QMAKE_CXXFLAGS += -w44996 -QT += core - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro deleted file mode 100644 index 82a2ae5c89..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = leak3 - -CONFIG += debug - -QT += core - -osx: CONFIG -= app_bundle -msvc: QMAKE_CXXFLAGS += -w44996 - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro b/tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro deleted file mode 100644 index f1450eca27..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app -TARGET = leak4 - -CONFIG += debug - -QT += core - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro deleted file mode 100644 index 4ed187b29d..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = app -TARGET = overlap - -CONFIG += debug console -CONFIG -= qt -!msvc: QMAKE_CXXFLAGS *= -O0 -fno-builtin - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro deleted file mode 100644 index fdb2aadceb..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro +++ /dev/null @@ -1,12 +0,0 @@ -TEMPLATE = app -TARGET = syscall - -CONFIG += debug -msvc: QMAKE_CXXFLAGS += -w44700 -else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized - -QT += core - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/testapps.pro b/tests/auto/valgrind/memcheck/testapps/testapps.pro deleted file mode 100644 index 90490cf34c..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/testapps.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += leak1 leak2 leak3 leak4 uninit1 uninit2 syscall free1 uninit3 free2 invalidjump \ - overlap diff --git a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro deleted file mode 100644 index 499c5b55b4..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = uninit1 - -CONFIG += debug console -CONFIG -= qt -msvc: QMAKE_CXXFLAGS += -w44700 -else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro deleted file mode 100644 index a1818617d9..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = uninit2 - -CONFIG += debug console -CONFIG -= qt -msvc: QMAKE_CXXFLAGS += -w44700 -else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro deleted file mode 100644 index 23e9be1804..0000000000 --- a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = uninit3 - -CONFIG += debug console -CONFIG -= qt -msvc: QMAKE_CXXFLAGS += -w44700 -else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized - -macx:CONFIG -= app_bundle - -SOURCES += main.cpp diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro deleted file mode 100644 index 4fd23012d2..0000000000 --- a/tests/manual/fakevim/fakevim.pro +++ /dev/null @@ -1,19 +0,0 @@ -include(../../auto/qttest.pri) -DEFINES += FAKEVIM_STANDALONE \ - QTCREATOR_UTILS_STATIC_LIB - -FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim -UTILSDIR = $$IDE_SOURCE_TREE/src/libs/utils - -SOURCES += main.cpp \ - $$FAKEVIMDIR/fakevimhandler.cpp \ - $$FAKEVIMDIR/fakevimactions.cpp \ - $$UTILSDIR/hostosinfo.cpp \ - $$UTILSDIR/qtcassert.cpp - -HEADERS += $$FAKEVIMDIR/fakevimhandler.h \ - $$FAKEVIMDIR/fakevimactions.h \ - $$UTILSDIR/hostosinfo.h \ - $$UTILSDIR/qtcassert.h - -INCLUDEPATH += $$FAKEVIMDIR diff --git a/tests/manual/pluginview/plugindialog_test.pro b/tests/manual/pluginview/plugindialog_test.pro deleted file mode 100644 index dbb6cd54f6..0000000000 --- a/tests/manual/pluginview/plugindialog_test.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -TARGET = plugindialog - -# Input -HEADERS += plugindialog.h -SOURCES += plugindialog.cpp - -QTC_LIB_DEPENDS += \ - extensionsystem \ - utils -include(../../auto/qttest.pri) diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.pro b/tests/manual/pluginview/plugins/plugin1/plugin1.pro deleted file mode 100644 index f6cbefc623..0000000000 --- a/tests/manual/pluginview/plugins/plugin1/plugin1.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = lib - -SOURCES += plugin1.cpp -HEADERS += plugin1.h -OTHER_FILES += plugin1.json - -QTC_LIB_DEPENDS += extensionsystem -include(../../../../auto/qttest.pri) - -TARGET = $$qtLibraryTargetName(plugin1) - -LIBS += -L$${OUT_PWD}/../plugin2 -L$${OUT_PWD}/../plugin3 -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3) - -osx { -} else:unix { - QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2 - QMAKE_RPATHDIR += $${OUT_PWD}/../plugin3 -} else:win32 { - DESTDIR = $$OUT_PWD -} diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.pro b/tests/manual/pluginview/plugins/plugin2/plugin2.pro deleted file mode 100644 index b4be4db613..0000000000 --- a/tests/manual/pluginview/plugins/plugin2/plugin2.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = lib - -SOURCES += plugin2.cpp -HEADERS += plugin2.h -OTHER_FILES += plugin2.json - -QTC_LIB_DEPENDS += extensionsystem -include(../../../../auto/qttest.pri) - -TARGET = $$qtLibraryTargetName(plugin2) - -osx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/ -} else:win32 { - DESTDIR = $$OUT_PWD -} - diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.pro b/tests/manual/pluginview/plugins/plugin3/plugin3.pro deleted file mode 100644 index 8b2b1026a4..0000000000 --- a/tests/manual/pluginview/plugins/plugin3/plugin3.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = lib - -SOURCES += plugin3.cpp -HEADERS += plugin3.h -OTHER_FILES += plugin3.json - -QTC_LIB_DEPENDS += extensionsystem -include(../../../../auto/qttest.pri) - -TARGET = $$qtLibraryTargetName(plugin3) - -LIBS += -L$${OUT_PWD}/../plugin2 -l$$qtLibraryName(plugin2) - -osx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/ -} else:unix { - QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2 -} else:win32 { - DESTDIR = $$OUT_PWD -} diff --git a/tests/manual/pluginview/plugins/plugins.pro b/tests/manual/pluginview/plugins/plugins.pro deleted file mode 100644 index f0d76950e8..0000000000 --- a/tests/manual/pluginview/plugins/plugins.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS = plugin2 plugin3 plugin1 diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.pro b/tests/tools/qml-ast2dot/qml-ast2dot.pro deleted file mode 100644 index 41faba1d53..0000000000 --- a/tests/tools/qml-ast2dot/qml-ast2dot.pro +++ /dev/null @@ -1,19 +0,0 @@ -QT = core gui -QTC_LIB_DEPENDS += qmljs -include(../../../qtcreator.pri) -macx:CONFIG -= app_bundle -TARGET = qml-ast2dot - -# Input -SOURCES += main.cpp - -unix { - debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared - release:OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared - - debug:MOC_DIR = $${OUT_PWD}/.moc/debug-shared - release:MOC_DIR = $${OUT_PWD}/.moc/release-shared - - RCC_DIR = $${OUT_PWD}/.rcc/ - UI_DIR = $${OUT_PWD}/.uic/ -} |
