From 4d528a06c21811b9ac6dbb8ecde23c2537c4c567 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 12 Apr 2021 14:53:28 +0200 Subject: Remove QMake project files Remove the .pro/.pri project files and the associated .prev_CMakeLists.txt files. Task-number: QTBUG-78167 Pick-to: 6.1 Change-Id: I8dea2d3efccf8bae6a4b41779dccfaf5f9f83222 Reviewed-by: Alexandru Croitor --- .prev_CMakeLists.txt | 20 --------- qtactiveqt.pro | 9 ---- src/activeqt/.prev_CMakeLists.txt | 22 ---------- src/activeqt/activeqt.pro | 14 ------ src/activeqt/axbase/axbase.pro | 18 -------- src/activeqt/container/container.pro | 32 -------------- src/activeqt/control/control.pro | 32 -------------- src/src.pro | 4 -- src/tools/idc/.prev_CMakeLists.txt | 17 -------- src/tools/idc/idc.pro | 6 --- src/tools/tools.pro | 2 - tests/auto/.prev_CMakeLists.txt | 9 ---- tests/auto/auto.pro | 10 ----- tests/auto/cmake/cmake.pro | 5 --- tests/auto/conversion/conversion.pro | 3 -- tests/auto/dumpcpp/dumpcpp.pro | 11 ----- tests/auto/qaxobject/qaxobject.pro | 3 -- tests/auto/qaxscript/qaxscript.pro | 3 -- tests/manual/axviewer/.prev_CMakeLists.txt | 69 ------------------------------ tests/manual/axviewer/axviewer.pro | 9 ---- tests/manual/dumpcpp/dumpcpp.pro | 13 ------ tests/manual/manual.pro | 2 - tests/manual/shared/shared.pri | 3 -- tests/manual/testcontrol/testcontrol.pro | 6 --- tests/tests.pro | 2 - tools/dumpcpp/.prev_CMakeLists.txt | 24 ----------- tools/dumpcpp/dumpcpp.pro | 8 ---- tools/dumpdoc/.prev_CMakeLists.txt | 19 -------- tools/dumpdoc/dumpdoc.pro | 6 --- tools/testcon/.prev_CMakeLists.txt | 53 ----------------------- tools/testcon/testcon.pro | 15 ------- tools/tools.pro | 11 ----- 32 files changed, 460 deletions(-) delete mode 100644 .prev_CMakeLists.txt delete mode 100644 qtactiveqt.pro delete mode 100644 src/activeqt/.prev_CMakeLists.txt delete mode 100644 src/activeqt/activeqt.pro delete mode 100644 src/activeqt/axbase/axbase.pro delete mode 100644 src/activeqt/container/container.pro delete mode 100644 src/activeqt/control/control.pro delete mode 100644 src/src.pro delete mode 100644 src/tools/idc/.prev_CMakeLists.txt delete mode 100644 src/tools/idc/idc.pro delete mode 100644 src/tools/tools.pro delete mode 100644 tests/auto/.prev_CMakeLists.txt delete mode 100644 tests/auto/auto.pro delete mode 100644 tests/auto/cmake/cmake.pro delete mode 100644 tests/auto/conversion/conversion.pro delete mode 100644 tests/auto/dumpcpp/dumpcpp.pro delete mode 100644 tests/auto/qaxobject/qaxobject.pro delete mode 100644 tests/auto/qaxscript/qaxscript.pro delete mode 100644 tests/manual/axviewer/.prev_CMakeLists.txt delete mode 100644 tests/manual/axviewer/axviewer.pro delete mode 100644 tests/manual/dumpcpp/dumpcpp.pro delete mode 100644 tests/manual/manual.pro delete mode 100644 tests/manual/shared/shared.pri delete mode 100644 tests/manual/testcontrol/testcontrol.pro delete mode 100644 tests/tests.pro delete mode 100644 tools/dumpcpp/.prev_CMakeLists.txt delete mode 100644 tools/dumpcpp/dumpcpp.pro delete mode 100644 tools/dumpdoc/.prev_CMakeLists.txt delete mode 100644 tools/dumpdoc/dumpdoc.pro delete mode 100644 tools/testcon/.prev_CMakeLists.txt delete mode 100644 tools/testcon/testcon.pro delete mode 100644 tools/tools.pro diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt deleted file mode 100644 index 3835798..0000000 --- a/.prev_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from qtactiveqt.pro. - -cmake_minimum_required(VERSION 3.16) - -include(.cmake.conf) -project(activeqt_FIXME - VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt activeqt_FIXME Libraries" - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C -) - -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - -if(NOT TARGET Qt::Widgets) - message(NOTICE "Skipping the build as the condition \"TARGET Qt::Widgets\" is not met.") - return() -endif() -qt_build_repo() diff --git a/qtactiveqt.pro b/qtactiveqt.pro deleted file mode 100644 index ba8e079..0000000 --- a/qtactiveqt.pro +++ /dev/null @@ -1,9 +0,0 @@ -requires(qtHaveModule(widgets)) - -CONFIG += tests_need_tools -load(qt_parts) - -!win32 { - message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") - SUBDIRS = src -} diff --git a/src/activeqt/.prev_CMakeLists.txt b/src/activeqt/.prev_CMakeLists.txt deleted file mode 100644 index bdfe1b3..0000000 --- a/src/activeqt/.prev_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Generated from activeqt.pro. - -##################################################################### -## activeqt Binary: -##################################################################### - -qt_add_executable(activeqt - GUI - PUBLIC_LIBRARIES - Qt::Gui -) - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:activeqt.pro:WIN32: -# SUBDIRS = "axbase" "control" "container" "activeqt" -# TEMPLATE = "subdirs" -# activeqt.file = "activeqt.prx" - -#### Keys ignored in scope 3:.:.:activeqt.pro:else: -# TEMPLATE = "aux" diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro deleted file mode 100644 index 327c232..0000000 --- a/src/activeqt/activeqt.pro +++ /dev/null @@ -1,14 +0,0 @@ -win32 { - TEMPLATE = subdirs - - CONFIG += ordered - activeqt.file = activeqt.prx - SUBDIRS = axbase control container activeqt -} else { - # fake project for creating the documentation - message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") - TEMPLATE = aux - CONFIG += force_qt - QMAKE_DOCS = $$PWD/doc/activeqt.qdocconf -} - diff --git a/src/activeqt/axbase/axbase.pro b/src/activeqt/axbase/axbase.pro deleted file mode 100644 index 2c53614..0000000 --- a/src/activeqt/axbase/axbase.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = QtAxBase -MODULE = axbase - -QT += core-private gui-private widgets -CONFIG += static internal_module - -load(qt_module) - -LIBS_PRIVATE += -lole32 -loleaut32 -luser32 -lgdi32 -ladvapi32 -mingw: LIBS_PRIVATE += -luuid - -HEADERS = \ - qaxtypefunctions_p.h \ - qaxutils_p.h - -SOURCES = \ - qaxtypefunctions.cpp \ - qaxutils.cpp diff --git a/src/activeqt/container/container.pro b/src/activeqt/container/container.pro deleted file mode 100644 index f0b482b..0000000 --- a/src/activeqt/container/container.pro +++ /dev/null @@ -1,32 +0,0 @@ -TARGET = QtAxContainer - -QT += widgets -QT_PRIVATE += core-private gui-private widgets-private axbase-private -CONFIG += static - -HEADERS = ../control/qaxaggregated.h \ - qaxbase.h \ - qaxbase_p.h \ - qaxwidget.h \ - qaxwidget_p.h \ - qaxobject.h \ - qaxobject_p.h \ - qaxobjectinterface.h \ - qaxscript.h \ - qaxselect.h \ - ../shared/qaxtypes_p.h - -SOURCES = qaxbase.cpp \ - qaxdump.cpp \ - qaxwidget.cpp \ - qaxobject.cpp \ - qaxscript.cpp \ - qaxscriptwrapper.cpp \ - qaxselect.cpp \ - ../shared/qaxtypes.cpp - -FORMS = qaxselect.ui - -MODULE = axcontainer -MODULE_CONFIG = dumpcpp -load(qt_module) diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro deleted file mode 100644 index e5f251e..0000000 --- a/src/activeqt/control/control.pro +++ /dev/null @@ -1,32 +0,0 @@ -TARGET = QtAxServer - -QT += widgets -QT_PRIVATE += core-private gui-private widgets-private axbase-private -CONFIG += static - -DEFINES += QAX_SERVER - -mingw: DEFINES += QT_NEEDS_QMAIN - -HEADERS = qaxaggregated.h \ - qaxbindable.h \ - qaxfactory.h \ - qclassfactory_p.h \ - ../shared/qaxtypes_p.h - -SOURCES = qaxaggregated.cpp \ - qaxserver.cpp \ - qaxserverbase.cpp \ - qaxbindable.cpp \ - qaxfactory.cpp \ - qaxservermain.cpp \ - qaxserverdll.cpp \ - qaxmain.cpp \ - ../shared/qaxtypes.cpp - -LIBS += -lshell32 - -MODULE = axserver -MODULE_DEFINES = QAXSERVER -MODULE_CONFIG = idcidl force_import_plugins -load(qt_module) diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index f8c9d2c..0000000 --- a/src/src.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = activeqt -win32: SUBDIRS += tools -CONFIG += ordered diff --git a/src/tools/idc/.prev_CMakeLists.txt b/src/tools/idc/.prev_CMakeLists.txt deleted file mode 100644 index 2cdd3d6..0000000 --- a/src/tools/idc/.prev_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# Generated from idc.pro. - -##################################################################### -## idc Tool: -##################################################################### - -qt_get_tool_target_name(target_name idc) -qt_add_tool(${target_name} - BOOTSTRAP - TARGET_DESCRIPTION "Active Qt Interface Description Compiler" - SOURCES - main.cpp -) - -#### Keys ignored in scope 1:.:.:idc.pro:: -# QMAKE_TARGET_DESCRIPTION = "Active Qt Interface Description Compiler" -# _OPTION = "host_build" diff --git a/src/tools/idc/idc.pro b/src/tools/idc/idc.pro deleted file mode 100644 index 7f9a8d4..0000000 --- a/src/tools/idc/idc.pro +++ /dev/null @@ -1,6 +0,0 @@ -option(host_build) -CONFIG += force_bootstrap -SOURCES = main.cpp - -QMAKE_TARGET_DESCRIPTION = "Active Qt Interface Description Compiler" -load(qt_tool) diff --git a/src/tools/tools.pro b/src/tools/tools.pro deleted file mode 100644 index 5824cfa..0000000 --- a/src/tools/tools.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += idc diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt deleted file mode 100644 index adb25cf..0000000 --- a/tests/auto/.prev_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Generated from auto.pro. - -add_subdirectory(conversion) -add_subdirectory(qaxobject) -add_subdirectory(dumpcpp) -add_subdirectory(cmake) -if(NOT GCC) - add_subdirectory(qaxscript) -endif() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index 0b43b0d..0000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - conversion \ - qaxobject \ - qaxscript \ - dumpcpp \ - cmake - -*g++*: SUBDIRS -= \ - qaxscript \ diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index bf2dbcb..0000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,5 +0,0 @@ - -# Cause make to do nothing. -TEMPLATE = subdirs - -CONFIG += ctest_testcase diff --git a/tests/auto/conversion/conversion.pro b/tests/auto/conversion/conversion.pro deleted file mode 100644 index 47f0699..0000000 --- a/tests/auto/conversion/conversion.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += testcase -QT += axcontainer testlib -SOURCES += tst_conversion.cpp diff --git a/tests/auto/dumpcpp/dumpcpp.pro b/tests/auto/dumpcpp/dumpcpp.pro deleted file mode 100644 index aae7bd8..0000000 --- a/tests/auto/dumpcpp/dumpcpp.pro +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG += testcase -QT += widgets axcontainer testlib -SOURCES += tst_dumpcpp.cpp -TARGET = tst_dumpcpp - -# Assume Web Browser type library is available in all windows installations -TYPELIBS = $$(SystemRoot)\\system32\\ieframe.dll - -!exists($$TYPELIBS) { - message("Web Browser type library for test not found!") -} diff --git a/tests/auto/qaxobject/qaxobject.pro b/tests/auto/qaxobject/qaxobject.pro deleted file mode 100644 index e6f51a1..0000000 --- a/tests/auto/qaxobject/qaxobject.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += testcase -QT += axcontainer testlib -SOURCES += tst_qaxobject.cpp diff --git a/tests/auto/qaxscript/qaxscript.pro b/tests/auto/qaxscript/qaxscript.pro deleted file mode 100644 index 704b2cd..0000000 --- a/tests/auto/qaxscript/qaxscript.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG += testcase -QT = core axcontainer testlib -SOURCES += tst_qaxscript.cpp diff --git a/tests/manual/axviewer/.prev_CMakeLists.txt b/tests/manual/axviewer/.prev_CMakeLists.txt deleted file mode 100644 index bcbe193..0000000 --- a/tests/manual/axviewer/.prev_CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -# Generated from axviewer.pro. - -##################################################################### -## axviewer Binary: -##################################################################### - -qt_add_manual_test(axviewer - SOURCES - ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h - ../shared/textdialog.cpp ../shared/textdialog.h - main.cpp - INCLUDE_DIRECTORIES - ../shared - PUBLIC_LIBRARIES - Qt::AxContainer - Qt::Gui - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:axviewer.pro:: -# DIAGLIB = "../../../../qtbase/tests/manual/diaglib" -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -qt_extend_target(axviewer CONDITION EXISTS _ss_DIAGLIB - SOURCES - ../../../../qtbase/tests/manual/diaglib/eventfilter.cpp ../../../../qtbase/tests/manual/diaglib/eventfilter.h - ../../../../qtbase/tests/manual/diaglib/nativewindowdump.h - ../../../../qtbase/tests/manual/diaglib/qwindowdump.cpp ../../../../qtbase/tests/manual/diaglib/qwindowdump.h - ../../../../qtbase/tests/manual/diaglib/textdump.cpp ../../../../qtbase/tests/manual/diaglib/textdump.h - DEFINES - QT_DIAG_LIB - INCLUDE_DIRECTORIES - ../../../../qtbase/tests/manual/diaglib - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate -) - -qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (WIN32) - SOURCES - ../../../../qtbase/tests/manual/diaglib/nativewindowdump_win.cpp - PUBLIC_LIBRARIES - user32 -) - -qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (NOT (WIN32)) - SOURCES - ../../../../qtbase/tests/manual/diaglib/nativewindowdump.cpp -) - -qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (QT_FEATURE_widgets) - SOURCES - ../../../../qtbase/tests/manual/diaglib/debugproxystyle.cpp ../../../../qtbase/tests/manual/diaglib/debugproxystyle.h - ../../../../qtbase/tests/manual/diaglib/logwidget.cpp ../../../../qtbase/tests/manual/diaglib/logwidget.h - ../../../../qtbase/tests/manual/diaglib/qwidgetdump.cpp ../../../../qtbase/tests/manual/diaglib/qwidgetdump.h - PUBLIC_LIBRARIES - Qt::WidgetsPrivate -) - -qt_extend_target(axviewer CONDITION (EXISTS _ss_DIAGLIB) AND (QT_FEATURE_opengl) - SOURCES - ../../../../qtbase/tests/manual/diaglib/glinfo.cpp ../../../../qtbase/tests/manual/diaglib/glinfo.h - PUBLIC_LIBRARIES - Qt::OpenGL - Qt::OpenGLWidgets -) diff --git a/tests/manual/axviewer/axviewer.pro b/tests/manual/axviewer/axviewer.pro deleted file mode 100644 index a609e49..0000000 --- a/tests/manual/axviewer/axviewer.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app -QT = core gui widgets axcontainer -CONFIG += console c++11 - -SOURCES += main.cpp -include(../shared/shared.pri) - -DIAGLIB = ../../../../qtbase/tests/manual/diaglib -exists($$DIAGLIB):include($$DIAGLIB/diaglib.pri) diff --git a/tests/manual/dumpcpp/dumpcpp.pro b/tests/manual/dumpcpp/dumpcpp.pro deleted file mode 100644 index 6f116c0..0000000 --- a/tests/manual/dumpcpp/dumpcpp.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE=app -CONFIG += QMAKE_LFLAGS_CONSOLE -QT += widgets axcontainer testlib - -SOURCES += main.cpp -include(../shared/shared.pri) - -# Assume Web Browser type library is available in all windows installations -TYPELIBS = $$(SystemRoot)\\system32\\ieframe.dll - -!exists($$TYPELIBS) { - message("Web Browser type library for test not found!") -} diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro deleted file mode 100644 index 5749606..0000000 --- a/tests/manual/manual.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += axviewer dumpcpp testcontrol diff --git a/tests/manual/shared/shared.pri b/tests/manual/shared/shared.pri deleted file mode 100644 index ffd18b3..0000000 --- a/tests/manual/shared/shared.pri +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES += $$PWD/metaobjectdump.cpp $$PWD/textdialog.cpp -HEADERS += $$PWD/metaobjectdump.h $$PWD/textdialog.h -INCLUDEPATH += $$PWD diff --git a/tests/manual/testcontrol/testcontrol.pro b/tests/manual/testcontrol/testcontrol.pro deleted file mode 100644 index 30a0b48..0000000 --- a/tests/manual/testcontrol/testcontrol.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += widgets axserver -TARGET = testcontrol -TEMPLATE = app -SOURCES += main.cpp -CONFIG += warn_off -RC_FILE = testcontrol.rc diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index 157ef34..0000000 --- a/tests/tests.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += auto diff --git a/tools/dumpcpp/.prev_CMakeLists.txt b/tools/dumpcpp/.prev_CMakeLists.txt deleted file mode 100644 index dd38bd9..0000000 --- a/tools/dumpcpp/.prev_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Generated from dumpcpp.pro. - -##################################################################### -## dumpcpp Tool: -##################################################################### - -qt_get_tool_target_name(target_name dumpcpp) -qt_add_tool(${target_name} - TARGET_DESCRIPTION "Active Qt DumpCpp" - SOURCES - main.cpp - moc.cpp moc.h - DEFINES - QT_ASCII_CAST_WARNINGS - QT_NO_CAST_TO_ASCII - PUBLIC_LIBRARIES - Qt::AxContainer - Qt::CorePrivate - Qt::Gui - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:dumpcpp.pro:: -# QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp" diff --git a/tools/dumpcpp/dumpcpp.pro b/tools/dumpcpp/dumpcpp.pro deleted file mode 100644 index 5b56cea..0000000 --- a/tools/dumpcpp/dumpcpp.pro +++ /dev/null @@ -1,8 +0,0 @@ -QT += axcontainer widgets core-private -DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS - -SOURCES = main.cpp moc.cpp -HEADERS += moc.h - -QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp" -load(qt_tool) diff --git a/tools/dumpdoc/.prev_CMakeLists.txt b/tools/dumpdoc/.prev_CMakeLists.txt deleted file mode 100644 index ac903a6..0000000 --- a/tools/dumpdoc/.prev_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Generated from dumpdoc.pro. - -##################################################################### -## dumpdoc Tool: -##################################################################### - -qt_get_tool_target_name(target_name dumpdoc) -qt_add_tool(${target_name} - TARGET_DESCRIPTION "Active Qt DumpDoc" - SOURCES - main.cpp - PUBLIC_LIBRARIES - Qt::AxContainer - Qt::Gui - Qt::Widgets -) - -#### Keys ignored in scope 1:.:.:dumpdoc.pro:: -# QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc" diff --git a/tools/dumpdoc/dumpdoc.pro b/tools/dumpdoc/dumpdoc.pro deleted file mode 100644 index b879a68..0000000 --- a/tools/dumpdoc/dumpdoc.pro +++ /dev/null @@ -1,6 +0,0 @@ -QT += axcontainer widgets - -SOURCES += main.cpp - -QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc" -load(qt_tool) diff --git a/tools/testcon/.prev_CMakeLists.txt b/tools/testcon/.prev_CMakeLists.txt deleted file mode 100644 index f5acf7d..0000000 --- a/tools/testcon/.prev_CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -# Generated from testcon.pro. - -##################################################################### -## testcon Binary: -##################################################################### - -qt_add_executable(testcon - GUI - OUTPUT_DIRECTORY "$$[QT_INSTALL_BINS]" - INSTALL_DIRECTORY "$$[QT_INSTALL_BINS]" - SOURCES - ambientproperties.cpp ambientproperties.h ambientproperties.ui - changeproperties.cpp changeproperties.h changeproperties.ui - controlinfo.cpp controlinfo.h controlinfo.ui - docuwindow.cpp docuwindow.h - invokemethod.cpp invokemethod.h invokemethod.ui - main.cpp - mainwindow.cpp mainwindow.h mainwindow.ui - PUBLIC_LIBRARIES - Qt::AxContainer - Qt::AxContainerPrivate - Qt::AxServer - Qt::Gui - Qt::PrintSupport - Qt::Widgets - ENABLE_AUTOGEN_TOOLS - uic -) - -# Resources: -set(testcon_resource_files - "images/controlmethods.png" - "images/controlproperties.png" - "images/filenew.png" -) - -qt_add_resource(testcon "testcon" - PREFIX - "/" - FILES - ${testcon_resource_files} -) - - -#### Keys ignored in scope 1:.:.:testcon.pro:: -# RC_FILE = "testcon.rc" -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:testcon.pro:NOT MINGW: -# QMAKE_POST_LINK = "midl" "$$shell_quote($$shell_path $$PWD/testcon.idl)" "&&" "move" "testcon.tlb" "$(TARGETDIR)" diff --git a/tools/testcon/testcon.pro b/tools/testcon/testcon.pro deleted file mode 100644 index f796ba9..0000000 --- a/tools/testcon/testcon.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app - -CONFIG += qaxserver_no_postlink -QT += widgets axserver axcontainer axcontainer-private printsupport - -SOURCES = main.cpp docuwindow.cpp mainwindow.cpp invokemethod.cpp changeproperties.cpp ambientproperties.cpp controlinfo.cpp -HEADERS = docuwindow.h mainwindow.h invokemethod.h changeproperties.h ambientproperties.h controlinfo.h -FORMS = mainwindow.ui invokemethod.ui changeproperties.ui ambientproperties.ui controlinfo.ui -RC_FILE = testcon.rc -RESOURCES += testcon.qrc - -!mingw:QMAKE_POST_LINK = midl $$shell_quote($$shell_path($$PWD/testcon.idl)) && move testcon.tlb $(TARGETDIR) - -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target diff --git a/tools/tools.pro b/tools/tools.pro deleted file mode 100644 index 4a83738..0000000 --- a/tools/tools.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs - -CONFIG += ordered - -SUBDIRS = dumpdoc \ - dumpcpp \ - testcon - -qtNomakeTools( \ - testcon \ -) -- cgit v1.2.3