diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-01-15 13:37:58 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-01-15 15:34:22 +0100 |
| commit | 78ab4b8d8b75fed240cded1a3f182048e56a8823 (patch) | |
| tree | 96cdc6b049a1f8330648134eecfe74b75be28350 /src | |
| parent | bd017c18ab1faa6011db12afadade74172e03de7 (diff) | |
Remove the qmake project files
Remove all qmake project files, except for examples which are used to
test that qmake continues to work.
Change-Id: Ic4abb72dc2dcd75df7a797c56056b6b3c5fe62ac
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
83 files changed, 0 insertions, 2906 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri deleted file mode 100644 index 90a795c6ce..0000000000 --- a/src/3rdparty/masm/masm-defs.pri +++ /dev/null @@ -1,47 +0,0 @@ -DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" -DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1 - -# Avoid symbol clashes with QtScript during static linking -DEFINES += WTFReportAssertionFailure=qmlWTFReportAssertionFailure -DEFINES += WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage -DEFINES += WTFReportBacktrace=qmlWTFReportBacktrace -DEFINES += WTFInvokeCrashHook=qmlWTFInvokeCrashHook - -win*: DEFINES += NOMINMAX - -DEFINES += ENABLE_LLINT=0 -DEFINES += ENABLE_DFG_JIT=0 -DEFINES += ENABLE_DFG_JIT_UTILITY_METHODS=1 -DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 -DEFINES += BUILDING_QT__ - -INCLUDEPATH += $$PWD/jit -INCLUDEPATH += $$PWD/assembler -INCLUDEPATH += $$PWD/runtime -INCLUDEPATH += $$PWD/wtf -INCLUDEPATH += $$PWD/stubs -INCLUDEPATH += $$PWD/stubs/runtime -INCLUDEPATH += $$PWD/stubs/wtf -INCLUDEPATH += $$PWD - -disassembler { - if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")): DEFINES += WTF_USE_UDIS86=1 - if(isEqual(QT_ARCH, "arm")): DEFINES += WTF_USE_ARMV7_DISASSEMBLER=1 - if(isEqual(QT_ARCH, "arm64")): DEFINES += WTF_USE_ARM64_DISASSEMBLER=1 - if(isEqual(QT_ARCH, "mips")): DEFINES += WTF_USE_MIPS32_DISASSEMBLER=1 -} else { - DEFINES += WTF_USE_UDIS86=0 -} - -INCLUDEPATH += $$PWD/disassembler -INCLUDEPATH += $$PWD/disassembler/udis86 -INCLUDEPATH += $$_OUT_PWD - -CONFIG(release, debug|release): DEFINES += NDEBUG - -!intel_icc:!clang:gcc { - greaterThan(QT_GCC_MAJOR_VERSION, 6) { # GCC 7 - QMAKE_CXXFLAGS_WARN_ON += -Wno-expansion-to-defined - QMAKE_CXXFLAGS += -Wno-expansion-to-defined - } -} diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri deleted file mode 100644 index bd193d9184..0000000000 --- a/src/3rdparty/masm/masm.pri +++ /dev/null @@ -1,159 +0,0 @@ -HEADERS += $$PWD/assembler/AbstractMacroAssembler.h \ - $$PWD/assembler/ARM64Assembler.h \ - $$PWD/assembler/ARMv7Assembler.h \ - $$PWD/assembler/AssemblerBuffer.h \ - $$PWD/assembler/AssemblerBufferWithConstantPool.h \ - $$PWD/assembler/CodeLocation.h \ - $$PWD/assembler/LinkBuffer.h \ - $$PWD/assembler/MacroAssemblerARM64.h \ - $$PWD/assembler/MacroAssemblerARMv7.h \ - $$PWD/assembler/MacroAssemblerCodeRef.h \ - $$PWD/assembler/MacroAssembler.h \ - $$PWD/assembler/MacroAssemblerMIPS.h \ - $$PWD/assembler/MacroAssemblerX86_64.h \ - $$PWD/assembler/MacroAssemblerX86Common.h \ - $$PWD/assembler/MacroAssemblerX86.h \ - $$PWD/assembler/MIPSAssembler.h \ - $$PWD/assembler/X86Assembler.h - -SOURCES += $$PWD/assembler/ARMv7Assembler.cpp \ - $$PWD/assembler/LinkBuffer.cpp - -HEADERS += $$PWD/wtf/ASCIICType.h \ - $$PWD/wtf/Assertions.h \ - $$PWD/wtf/Atomics.h \ - $$PWD/wtf/BumpPointerAllocator.h \ - $$PWD/wtf/CheckedArithmetic.h \ - $$PWD/wtf/Compiler.h \ - $$PWD/wtf/CryptographicallyRandomNumber.h \ - $$PWD/wtf/DataLog.h \ - $$PWD/wtf/DynamicAnnotations.h \ - $$PWD/wtf/EnumClass.h \ - $$PWD/wtf/FeatureDefines.h \ - $$PWD/wtf/FilePrintStream.h \ - $$PWD/wtf/Locker.h \ - $$PWD/wtf/MathExtras.h \ - $$PWD/wtf/NotFound.h \ - $$PWD/wtf/NullPtr.h \ - $$PWD/wtf/OSAllocator.h \ - $$PWD/wtf/PageAllocationAligned.h \ - $$PWD/wtf/PageAllocation.h \ - $$PWD/wtf/PageBlock.h \ - $$PWD/wtf/PageReservation.h \ - $$PWD/wtf/Platform.h \ - $$PWD/wtf/PossiblyNull.h \ - $$PWD/wtf/PrintStream.h \ - $$PWD/wtf/RawPointer.h \ - $$PWD/wtf/SegmentedVector.h \ - $$PWD/wtf/StdLibExtras.h \ - $$PWD/wtf/VMTags.h - -SOURCES += $$PWD/wtf/PrintStream.cpp \ - $$PWD/wtf/FilePrintStream.cpp \ - $$PWD/wtf/PageAllocationAligned.cpp \ - $$PWD/wtf/PageBlock.cpp - -win32: SOURCES += $$PWD/wtf/OSAllocatorWin.cpp -else:integrity: SOURCES += $$PWD/wtf/OSAllocatorIntegrity.cpp -else: SOURCES += $$PWD/wtf/OSAllocatorPosix.cpp - -SOURCES += $$PWD/stubs/WTFStubs.cpp -HEADERS += $$PWD/stubs/WTFStubs.h - -SOURCES += $$PWD/stubs/Options.cpp - -HEADERS += $$PWD/stubs/wtf/FastAllocBase.h \ - $$PWD/stubs/wtf/FastMalloc.h \ - $$PWD/stubs/wtf/Noncopyable.h \ - $$PWD/stubs/wtf/OwnPtr.h \ - $$PWD/stubs/wtf/PassOwnPtr.h \ - $$PWD/stubs/wtf/PassRefPtr.h \ - $$PWD/stubs/wtf/RefCounted.h \ - $$PWD/stubs/wtf/RefPtr.h \ - $$PWD/stubs/wtf/TypeTraits.h \ - $$PWD/stubs/wtf/UnusedParam.h \ - $$PWD/stubs/wtf/Vector.h - -SOURCES += $$PWD/disassembler/Disassembler.cpp -SOURCES += $$PWD/disassembler/UDis86Disassembler.cpp -contains(DEFINES, WTF_USE_UDIS86=1) { - SOURCES += $$PWD/disassembler/udis86/udis86.c - SOURCES += $$PWD/disassembler/udis86/udis86_decode.c - SOURCES += $$PWD/disassembler/udis86/udis86_input.c - SOURCES += $$PWD/disassembler/udis86/udis86_itab_holder.c - SOURCES += $$PWD/disassembler/udis86/udis86_syn-att.c - SOURCES += $$PWD/disassembler/udis86/udis86_syn.c - SOURCES += $$PWD/disassembler/udis86/udis86_syn-intel.c - - ITAB = $$PWD/disassembler/udis86/optable.xml - udis86.output = udis86_itab.h - udis86.input = ITAB - udis86.CONFIG += no_link - udis86.commands = $$QMAKE_PYTHON $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN} - QMAKE_EXTRA_COMPILERS += udis86 - - udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c - udis86_tab_cfile.depends = udis86_itab.h - QMAKE_EXTRA_TARGETS += udis86_tab_cfile -} - -# We can always compile these, they have ifdef guards inside -SOURCES += $$PWD/disassembler/ARMv7Disassembler.cpp -SOURCES += $$PWD/disassembler/ARMv7/ARMv7DOpcode.cpp -HEADERS += $$PWD/disassembler/ARMv7/ARMv7DOpcode.h -SOURCES += $$PWD/disassembler/Mips32Disassembler.cpp -SOURCES += $$PWD/disassembler/mips32/Mips32Opcode.cpp -HEADERS += $$PWD/disassembler/mips32/Mips32Opcode.h -SOURCES += $$PWD/disassembler/ARM64Disassembler.cpp -SOURCES += $$PWD/disassembler/ARM64/A64DOpcode.cpp -HEADERS += $$PWD/disassembler/ARM64/A64DOpcode.h - -SOURCES += $$PWD/yarr/YarrCanonicalizeUCS2.cpp \ - $$PWD/yarr/YarrCanonicalizeUnicode.cpp \ - $$PWD/yarr/YarrInterpreter.cpp \ - $$PWD/yarr/YarrJIT.cpp \ - $$PWD/yarr/YarrPattern.cpp \ - $$PWD/yarr/YarrSyntaxChecker.cpp \ - $$PWD/stubs/yarr/YarrUnicodeProperties.cpp - -HEADERS += $$PWD/yarr/Yarr.h \ - $$PWD/yarr/YarrCanonicalizeUCS2.h \ - $$PWD/yarr/YarrInterpreter.h \ - $$PWD/yarr/YarrJIT.h \ - $$PWD/yarr/YarrParser.h \ - $$PWD/yarr/YarrPattern.h \ - $$PWD/yarr/YarrSyntaxChecker.h \ - $$PWD/yarr/YarrUnicodeProperties.h - -# -# Generate RegExpJitTables.h -# -GENERATEDDIR = .generated -debug_and_release { - CONFIG(debug, debug|release) { - GENERATEDDIR = $$GENERATEDDIR/debug - } else { - GENERATEDDIR = $$GENERATEDDIR/release - } -} -INCLUDEPATH += $$GENERATEDDIR - -retgen.output = $$GENERATEDDIR/RegExpJitTables.h -retgen.script = $$PWD/yarr/create_regex_tables -retgen.input = retgen.script -retgen.CONFIG += no_link -retgen.commands = $$QMAKE_PYTHON $$retgen.script > ${QMAKE_FILE_OUT} -QMAKE_EXTRA_COMPILERS += retgen - -# Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf -!c++11:!intel_icc { - # Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways - clang { - QMAKE_CXXFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions - } else: gcc { - greaterThan(QT_GCC_MAJOR_VERSION, 4)|greaterThan(QT_GCC_MINOR_VERSION, 5) { - # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). - QMAKE_CXXFLAGS += -Wno-c++0x-compat - } - } -} diff --git a/src/3rdparty/masm/yarr/yarr.pri b/src/3rdparty/masm/yarr/yarr.pri deleted file mode 100644 index c8e30990be..0000000000 --- a/src/3rdparty/masm/yarr/yarr.pri +++ /dev/null @@ -1,15 +0,0 @@ -# ------------------------------------------------------------------- -# Project file for YARR -# -# See 'Tools/qmake/README' for an overview of the build system -# ------------------------------------------------------------------- - -SOURCES += \ - $$PWD/YarrInterpreter.cpp \ - $$PWD/YarrPattern.cpp \ - $$PWD/YarrSyntaxChecker.cpp \ - $$PWD/YarrCanonicalizeUCS2.cpp \ - $$PWD/YarrCanonicalizeUnicode.cpp \ - $$PWD/YarrErrorCode.cpp \ - $$PWD/YarrUnicodeProperties.cpp - diff --git a/src/imports/builtins/builtins.pro b/src/imports/builtins/builtins.pro deleted file mode 100644 index ea326b4e76..0000000000 --- a/src/imports/builtins/builtins.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = aux - -QMLTYPEFILE = builtins.qmltypes - -# install rule -builtins.files = $$QMLTYPEFILE -builtins.path = $$[QT_INSTALL_QML] -INSTALLS += builtins - -# copy to build directory -!prefix_build: COPIES += builtins diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro deleted file mode 100644 index c95a88430d..0000000000 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ /dev/null @@ -1,15 +0,0 @@ -CXX_MODULE = qml -TARGET = qmlfolderlistmodelplugin -TARGETPATH = Qt/labs/folderlistmodel -QML_IMPORT_VERSION = $$QT_VERSION - -QT = core-private qml-private - -SOURCES += qquickfolderlistmodel.cpp plugin.cpp \ - fileinfothread.cpp -HEADERS += qquickfolderlistmodel.h \ - fileproperty_p.h \ - fileinfothread_p.h - -CONFIG += qmltypes install_qmltypes -load(qml_plugin) diff --git a/src/imports/imports.pro b/src/imports/imports.pro deleted file mode 100644 index 38e6105c8a..0000000000 --- a/src/imports/imports.pro +++ /dev/null @@ -1,33 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += qml-private - -SUBDIRS += \ - builtins \ - qtqml \ - models \ - labsmodels \ - tooling - -qtConfig(qml-itemmodel): SUBDIRS += folderlistmodel -qtConfig(qml-worker-script): SUBDIRS += workerscript -qtHaveModule(sql): SUBDIRS += localstorage -qtConfig(settings): SUBDIRS += settings - -qtHaveModule(quick) { - QT_FOR_CONFIG += quick-private - - SUBDIRS += \ - labsanimation \ - layouts \ - qtquick2 - - qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh - - qtHaveModule(testlib): SUBDIRS += testlib - qtConfig(systemsemaphore): SUBDIRS += sharedimage - qtConfig(quick-particles): \ - SUBDIRS += particles - - qtConfig(quick-path): SUBDIRS += shapes -} - diff --git a/src/imports/labsanimation/labsanimation.pro b/src/imports/labsanimation/labsanimation.pro deleted file mode 100644 index 5fd8ff25a7..0000000000 --- a/src/imports/labsanimation/labsanimation.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = labsanimationplugin -TARGETPATH = Qt/labs/animation -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - qquickboundaryrule.cpp \ - plugin.cpp - -HEADERS += \ - qquickboundaryrule_p.h - -QT = qml-private quick-private - -CONFIG += qmltypes install_qmltypes -load(qml_plugin) diff --git a/src/imports/labsmodels/labsmodels.pro b/src/imports/labsmodels/labsmodels.pro deleted file mode 100644 index 9fc52ce9cc..0000000000 --- a/src/imports/labsmodels/labsmodels.pro +++ /dev/null @@ -1,30 +0,0 @@ -CXX_MODULE = qml -TARGET = labsmodelsplugin -TARGETPATH = Qt/labs/qmlmodels -QML_IMPORT_VERSION = $$QT_VERSION - -QT = qml-private qmlmodels-private - -SOURCES += \ - plugin.cpp - -qtConfig(qml-table-model) { - SOURCES += \ - $$PWD/qqmltablemodel.cpp \ - $$PWD/qqmltablemodelcolumn.cpp - - HEADERS += \ - $$PWD/qqmltablemodel_p.h \ - $$PWD/qqmltablemodelcolumn_p.h -} - -qtConfig(qml-delegate-model) { - SOURCES += \ - qqmldelegatecomponent.cpp - - HEADERS += \ - qqmldelegatecomponent_p.h -} - -CONFIG += qmltypes install_qmltypes -load(qml_plugin) diff --git a/src/imports/layouts/layouts.pro b/src/imports/layouts/layouts.pro deleted file mode 100644 index 1ae269da32..0000000000 --- a/src/imports/layouts/layouts.pro +++ /dev/null @@ -1,24 +0,0 @@ -CXX_MODULE = qml -TARGET = qquicklayoutsplugin -TARGETPATH = QtQuick/Layouts -QML_IMPORT_VERSION = $$QT_VERSION - -QT *= qml-private quick-private gui-private core-private - -SOURCES += plugin.cpp \ - qquicklayout.cpp \ - qquicklinearlayout.cpp \ - qquickstacklayout.cpp \ - qquickgridlayoutengine.cpp \ - qquicklayoutstyleinfo.cpp - -HEADERS += \ - qquicklayout_p.h \ - qquicklinearlayout_p.h \ - qquickstacklayout_p.h \ - qquickgridlayoutengine_p.h \ - qquicklayoutstyleinfo_p.h - -CONFIG += qmltypes install_qmltypes - -load(qml_plugin) diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro deleted file mode 100644 index 6dff4862c7..0000000000 --- a/src/imports/localstorage/localstorage.pro +++ /dev/null @@ -1,18 +0,0 @@ -CXX_MODULE = qml -TARGET = qmllocalstorageplugin -TARGETPATH = QtQuick/LocalStorage -QML_IMPORT_VERSION = $$QT_VERSION - -QT = sql qml-private core-private - -SOURCES += \ - plugin.cpp \ - qquicklocalstorage.cpp - -HEADERS += \ - qquicklocalstorage_p.h - -load(qml_plugin) - -CONFIG += qmltypes install_qmltypes -OTHER_FILES += localstorage.json diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro deleted file mode 100644 index 9a22049068..0000000000 --- a/src/imports/models/models.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = modelsplugin -TARGETPATH = QtQml/Models -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - plugin.cpp - -QT = qml-private qmlmodels-private - -load(qml_plugin) diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro deleted file mode 100644 index c0f2f990b5..0000000000 --- a/src/imports/particles/particles.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = particlesplugin -TARGETPATH = QtQuick/Particles -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - plugin.cpp - -QT += quick-private quickparticles-private qml-private - -load(qml_plugin) diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro deleted file mode 100644 index d32c7ad341..0000000000 --- a/src/imports/qtqml/qtqml.pro +++ /dev/null @@ -1,23 +0,0 @@ -TARGETPATH = QtQml -CXX_MODULE = qml -TARGET = qmlplugin -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - plugin.cpp - -# In Qt6 we won't need qmlmodels-private here -QT = qml-private qmlmodels-private - -DYNAMIC_QMLDIR = \ - "module QtQml" \ - "optional plugin qmlplugin" \ - "classname QtQmlPlugin" \ - "typeinfo plugins.qmltypes" \ - "designersupported" \ - "import QtQml.Models auto" - -qtConfig(qml-worker-script): DYNAMIC_QMLDIR += \ - "import QtQml.WorkerScript auto" - -load(qml_plugin) diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro deleted file mode 100644 index 35430d0638..0000000000 --- a/src/imports/qtquick2/qtquick2.pro +++ /dev/null @@ -1,13 +0,0 @@ -CXX_MODULE = qml -TARGET = qtquick2plugin -TARGETPATH = QtQuick -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - plugin.cpp - -QT += quick-private qml-private qmlmodels-private - -qtConfig(qml-worker-script): QT += qmlworkerscript-private - -load(qml_plugin) diff --git a/src/imports/settings/settings.pro b/src/imports/settings/settings.pro deleted file mode 100644 index 6fd8b8cddd..0000000000 --- a/src/imports/settings/settings.pro +++ /dev/null @@ -1,17 +0,0 @@ -CXX_MODULE = qml -TARGET = qmlsettingsplugin -TARGETPATH = Qt/labs/settings -QML_IMPORT_VERSION = $$QT_VERSION - -QT = core qml - -HEADERS += \ - qqmlsettings_p.h - -SOURCES += \ - plugin.cpp \ - qqmlsettings.cpp - -CONFIG += qmltypes install_qmltypes - -load(qml_plugin) diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro deleted file mode 100644 index b5f75343d7..0000000000 --- a/src/imports/shapes/shapes.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = qmlshapesplugin -TARGETPATH = QtQuick/Shapes -QML_IMPORT_VERSION = $$QT_VERSION - -QT = core gui-private qml quick-private quickshapes-private - -SOURCES += \ - plugin.cpp \ - -load(qml_plugin) diff --git a/src/imports/sharedimage/sharedimage.pro b/src/imports/sharedimage/sharedimage.pro deleted file mode 100644 index cee4c3465e..0000000000 --- a/src/imports/sharedimage/sharedimage.pro +++ /dev/null @@ -1,18 +0,0 @@ -CXX_MODULE = qml -TARGET = sharedimageplugin -TARGETPATH = Qt/labs/sharedimage -QML_IMPORT_VERSION = $$QT_VERSION - -QT *= quick-private qml gui-private core-private - -SOURCES += \ - plugin.cpp \ - sharedimageprovider.cpp \ - qsharedimageloader.cpp - -HEADERS += \ - sharedimageprovider.h \ - qsharedimageloader_p.h - -CONFIG += qmltypes install_qmltypes -load(qml_plugin) diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro deleted file mode 100644 index 523be8b33e..0000000000 --- a/src/imports/testlib/testlib.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = qmltestplugin -TARGETPATH = QtTest -QML_IMPORT_VERSION = $$QT_VERSION - -QT = qmltest-private qml core - -SOURCES += \ - main.cpp - -QML_FILES = \ - TestCase.qml \ - SignalSpy.qml \ - testlogger.js - -load(qml_plugin) diff --git a/src/imports/tooling/tooling.pro b/src/imports/tooling/tooling.pro deleted file mode 100644 index 8562e5eaa5..0000000000 --- a/src/imports/tooling/tooling.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGETPATH = QtQuick/tooling - -QML_FILES = \ - Component.qml \ - Enum.qml \ - Member.qml \ - Method.qml \ - Module.qml \ - Parameter.qml \ - Property.qml \ - Signal.qml - -load(qml_module) diff --git a/src/imports/wavefrontmesh/wavefrontmesh.pro b/src/imports/wavefrontmesh/wavefrontmesh.pro deleted file mode 100644 index 4aa06b97bf..0000000000 --- a/src/imports/wavefrontmesh/wavefrontmesh.pro +++ /dev/null @@ -1,16 +0,0 @@ -CXX_MODULE = qml -TARGET = qmlwavefrontmeshplugin -TARGETPATH = Qt/labs/wavefrontmesh -QML_IMPORT_VERSION = $$QT_VERSION - -QT = core-private qml-private quick-private - -SOURCES += \ - plugin.cpp \ - qwavefrontmesh.cpp - -HEADERS += \ - qwavefrontmesh.h - -CONFIG += qmltypes install_qmltypes -load(qml_plugin) diff --git a/src/imports/workerscript/workerscript.pro b/src/imports/workerscript/workerscript.pro deleted file mode 100644 index 9c6a65eb05..0000000000 --- a/src/imports/workerscript/workerscript.pro +++ /dev/null @@ -1,11 +0,0 @@ -CXX_MODULE = qml -TARGET = workerscriptplugin -TARGETPATH = QtQml/WorkerScript -QML_IMPORT_VERSION = $$QT_VERSION - -SOURCES += \ - plugin.cpp - -QT = qml-private qmlworkerscript-private - -load(qml_plugin) diff --git a/src/particles/particles.pri b/src/particles/particles.pri deleted file mode 100644 index 975ae0e070..0000000000 --- a/src/particles/particles.pri +++ /dev/null @@ -1,83 +0,0 @@ -HEADERS += \ - $$PWD/qquickangledirection_p.h \ - $$PWD/qquickcustomaffector_p.h \ - $$PWD/qquickellipseextruder_p.h \ - $$PWD/qquicktrailemitter_p.h \ - $$PWD/qquickfriction_p.h \ - $$PWD/qquickgravity_p.h \ - $$PWD/qquickimageparticle_p.h \ - $$PWD/qquickitemparticle_p.h \ - $$PWD/qquickage_p.h \ - $$PWD/qquicklineextruder_p.h \ - $$PWD/qquickmaskextruder_p.h \ - $$PWD/qquickparticleaffector_p.h \ - $$PWD/qquickparticleemitter_p.h \ - $$PWD/qquickparticleextruder_p.h \ - $$PWD/qquickparticleflatset_p.h \ - $$PWD/qquickparticlepainter_p.h \ - $$PWD/qquickparticlesmodule_p.h \ - $$PWD/qquickparticlesystem_p.h \ - $$PWD/qquickpointattractor_p.h \ - $$PWD/qquickpointdirection_p.h \ - $$PWD/qquickspritegoal_p.h \ - $$PWD/qquickdirection_p.h \ - $$PWD/qquicktargetdirection_p.h \ - $$PWD/qquickturbulence_p.h \ - $$PWD/qquickwander_p.h \ - $$PWD/qquickcumulativedirection_p.h \ - $$PWD/qquickv4particledata_p.h \ - $$PWD/qquickrectangleextruder_p.h \ - $$PWD/qquickparticlegroup_p.h \ - $$PWD/qquickgroupgoal_p.h \ - $$PWD/qtquickparticlesglobal_p.h - -SOURCES += \ - $$PWD/qquickangledirection.cpp \ - $$PWD/qquickcustomaffector.cpp \ - $$PWD/qquickellipseextruder.cpp \ - $$PWD/qquicktrailemitter.cpp \ - $$PWD/qquickfriction.cpp \ - $$PWD/qquickgravity.cpp \ - $$PWD/qquickimageparticle.cpp \ - $$PWD/qquickitemparticle.cpp \ - $$PWD/qquickage.cpp \ - $$PWD/qquicklineextruder.cpp \ - $$PWD/qquickmaskextruder.cpp \ - $$PWD/qquickparticleaffector.cpp \ - $$PWD/qquickparticleemitter.cpp \ - $$PWD/qquickparticleextruder.cpp \ - $$PWD/qquickparticlepainter.cpp \ - $$PWD/qquickparticlesmodule.cpp \ - $$PWD/qquickparticlesystem.cpp \ - $$PWD/qquickpointattractor.cpp \ - $$PWD/qquickpointdirection.cpp \ - $$PWD/qquickspritegoal.cpp \ - $$PWD/qquickdirection.cpp \ - $$PWD/qquicktargetdirection.cpp \ - $$PWD/qquickturbulence.cpp \ - $$PWD/qquickwander.cpp \ - $$PWD/qquickcumulativedirection.cpp \ - $$PWD/qquickv4particledata.cpp \ - $$PWD/qquickrectangleextruder.cpp \ - $$PWD/qquickparticlegroup.cpp \ - $$PWD/qquickgroupgoal.cpp - -OTHER_FILES += \ - $$PWD/shaders_ng/imageparticle_simplepoint.frag.qsb \ - $$PWD/shaders_ng/imageparticle_simplepoint.vert.qsb \ - $$PWD/shaders_ng/imageparticle_coloredpoint.frag.qsb \ - $$PWD/shaders_ng/imageparticle_coloredpoint.vert.qsb \ - $$PWD/shaders_ng/imageparticle_colored.frag.qsb \ - $$PWD/shaders_ng/imageparticle_colored.vert.qsb \ - $$PWD/shaders_ng/imageparticle_deformed.frag.qsb \ - $$PWD/shaders_ng/imageparticle_deformed.vert.qsb \ - $$PWD/shaders_ng/imageparticle_sprite.frag.qsb \ - $$PWD/shaders_ng/imageparticle_sprite.vert.qsb \ - $$PWD/shaders_ng/imageparticle_tabled.frag.qsb \ - $$PWD/shaders_ng/imageparticle_tabled.vert.qsb - -RESOURCES += \ - $$PWD/particles.qrc - - - diff --git a/src/particles/particles.pro b/src/particles/particles.pro deleted file mode 100644 index 6a117c65fe..0000000000 --- a/src/particles/particles.pro +++ /dev/null @@ -1,25 +0,0 @@ -TARGET = QtQuickParticles -MODULE = quickparticles - -CONFIG += internal_module - -QT = core-private gui-private qml-private quick-private - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES -msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS -solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - -exists("qqml_enable_gcov") { - QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors - LIBS_PRIVATE += -lgcov -} - -include(particles.pri) - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles -QML_IMPORT_NAME = QtQuick.Particles -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes - -load(qt_module) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index 86fdf87650..0000000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += qml - -qtConfig(thread):qtConfig(qml-debug):SUBDIRS += qmltooling -qtHaveModule(quick):SUBDIRS += scenegraph diff --git a/src/plugins/qmltooling/packetprotocol/packetprotocol.pro b/src/plugins/qmltooling/packetprotocol/packetprotocol.pro deleted file mode 100644 index a188b87a81..0000000000 --- a/src/plugins/qmltooling/packetprotocol/packetprotocol.pro +++ /dev/null @@ -1,14 +0,0 @@ -TARGET = QtPacketProtocol -QT = core-private -CONFIG += static internal_module - -HEADERS = \ - qpacketprotocol_p.h \ - qpacket_p.h \ - qversionedpacket_p.h - -SOURCES = \ - qpacketprotocol.cpp \ - qpacket.cpp - -load(qt_module) diff --git a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro b/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro deleted file mode 100644 index 2d8f0ceda2..0000000000 --- a/src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro +++ /dev/null @@ -1,29 +0,0 @@ -TARGET = qmldbg_debugger -QT = qml-private core-private packetprotocol-private - -SOURCES += \ - $$PWD/qqmldebuggerservicefactory.cpp \ - $$PWD/qqmlenginedebugservice.cpp \ - $$PWD/qqmlwatcher.cpp \ - $$PWD/qv4debugservice.cpp \ - $$PWD/qv4debugger.cpp \ - $$PWD/qv4debuggeragent.cpp \ - $$PWD/qv4datacollector.cpp \ - $$PWD/qv4debugjob.cpp - -HEADERS += \ - $$PWD/qqmldebuggerservicefactory.h \ - $$PWD/qqmlenginedebugservice.h \ - $$PWD/qqmlwatcher.h \ - $$PWD/qv4debugservice.h \ - $$PWD/qv4debugger.h \ - $$PWD/qv4debuggeragent.h \ - $$PWD/qv4datacollector.h \ - $$PWD/qv4debugjob.h - -OTHER_FILES += \ - $$PWD/qqmldebuggerservice.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlDebuggerServiceFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro deleted file mode 100644 index 18a61f15b7..0000000000 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ /dev/null @@ -1,23 +0,0 @@ -TARGET = qmldbg_inspector -QT += qml-private quick-private core-private gui-private packetprotocol-private - -SOURCES += \ - $$PWD/globalinspector.cpp \ - $$PWD/highlight.cpp \ - $$PWD/inspecttool.cpp \ - $$PWD/qqmlinspectorservice.cpp \ - $$PWD/qquickwindowinspector.cpp - -HEADERS += \ - $$PWD/globalinspector.h \ - $$PWD/highlight.h \ - $$PWD/inspecttool.h\ - $$PWD/qqmlinspectorservicefactory.h \ - $$PWD/qquickwindowinspector.h - -OTHER_FILES += \ - qqmlinspectorservice.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlInspectorServiceFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro b/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro deleted file mode 100644 index 71dba262da..0000000000 --- a/src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = qmldbg_local -QT = qml-private - -SOURCES += \ - $$PWD/qlocalclientconnection.cpp - -HEADERS += \ - $$PWD/qlocalclientconnectionfactory.h - -OTHER_FILES += \ - $$PWD/qlocalclientconnection.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QLocalClientConnectionFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro b/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro deleted file mode 100644 index eda6df1a16..0000000000 --- a/src/plugins/qmltooling/qmldbg_messages/qmldbg_messages.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qmldbg_messages -QT = qml-private core packetprotocol-private - -SOURCES += \ - $$PWD/qdebugmessageservice.cpp \ - $$PWD/qdebugmessageservicefactory.cpp - -HEADERS += \ - $$PWD/qdebugmessageservice.h \ - $$PWD/qdebugmessageservicefactory.h - -OTHER_FILES += \ - $$PWD/qdebugmessageservice.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QDebugMessageServiceFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro b/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro deleted file mode 100644 index 6630a394a0..0000000000 --- a/src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = qmldbg_native -QT = qml-private core-private packetprotocol-private - -HEADERS += \ - $$PWD/qqmlnativedebugconnector.h - -SOURCES += \ - $$PWD/qqmlnativedebugconnector.cpp - -OTHER_FILES += \ - $$PWD/qqmlnativedebugconnector.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlNativeDebugConnectorFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro b/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro deleted file mode 100644 index 1cb5525622..0000000000 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qmldbg_nativedebugger.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qmldbg_nativedebugger -QT = qml-private core packetprotocol-private - -SOURCES += \ - $$PWD/qqmlnativedebugservicefactory.cpp \ - $$PWD/qqmlnativedebugservice.cpp - -HEADERS += \ - $$PWD/qqmlnativedebugservicefactory.h \ - $$PWD/qqmlnativedebugservice.h \ - -OTHER_FILES += \ - $$PWD/qqmlnativedebugservice.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlNativeDebugServiceFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_preview/qmldbg_preview.pro b/src/plugins/qmltooling/qmldbg_preview/qmldbg_preview.pro deleted file mode 100644 index e1cbc393f7..0000000000 --- a/src/plugins/qmltooling/qmldbg_preview/qmldbg_preview.pro +++ /dev/null @@ -1,31 +0,0 @@ -QT += core-private qml-private packetprotocol-private network quick-private gui-private - -TARGET = qmldbg_preview - -SOURCES += \ - $$PWD/qqmldebugtranslationservice.cpp \ - $$PWD/qqmlpreviewblacklist.cpp \ - $$PWD/qqmlpreviewfileengine.cpp \ - $$PWD/qqmlpreviewfileloader.cpp \ - $$PWD/qqmlpreviewhandler.cpp \ - $$PWD/qqmlpreviewposition.cpp \ - $$PWD/qqmlpreviewservice.cpp \ - $$PWD/qqmlpreviewservicefactory.cpp - -HEADERS += \ - $$PWD/qqmldebugtranslationservice.h \ - $$PWD/qqmlpreviewblacklist.h \ - $$PWD/qqmlpreviewfileengine.h \ - $$PWD/qqmlpreviewfileloader.h \ - $$PWD/qqmlpreviewhandler.h \ - $$PWD/qqmlpreviewposition.h \ - $$PWD/qqmlpreviewservice.h \ - $$PWD/qqmlpreviewservicefactory.h - -OTHER_FILES += \ - $$PWD/qqmlpreviewservice.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlPreviewServiceFactory - -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro b/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro deleted file mode 100644 index ac874b079e..0000000000 --- a/src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro +++ /dev/null @@ -1,23 +0,0 @@ -TARGET = qmldbg_profiler -QT = qml-private core-private packetprotocol-private - -SOURCES += \ - $$PWD/qqmlenginecontrolservice.cpp \ - $$PWD/qqmlprofileradapter.cpp \ - $$PWD/qqmlprofilerservice.cpp \ - $$PWD/qqmlprofilerservicefactory.cpp \ - $$PWD/qv4profileradapter.cpp - -HEADERS += \ - $$PWD/qqmlenginecontrolservice.h \ - $$PWD/qqmlprofileradapter.h \ - $$PWD/qqmlprofilerservice.h \ - $$PWD/qqmlprofilerservicefactory.h \ - $$PWD/qv4profileradapter.h - -OTHER_FILES += \ - $$PWD/qqmlprofilerservice.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlProfilerServiceFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro b/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro deleted file mode 100644 index f165917041..0000000000 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/qmldbg_quickprofiler.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qmldbg_quickprofiler -QT += qml-private quick-private core-private packetprotocol-private - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQuickProfilerAdapterFactory -load(qt_plugin) - -SOURCES += \ - $$PWD/qquickprofileradapter.cpp \ - $$PWD/qquickprofileradapterfactory.cpp - -HEADERS += \ - $$PWD/qquickprofileradapter.h \ - $$PWD/qquickprofileradapterfactory.h \ - -OTHER_FILES += \ - qquickprofileradapter.json diff --git a/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro b/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro deleted file mode 100644 index d7d24a4d39..0000000000 --- a/src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = qmldbg_server -QT = qml-private packetprotocol-private - -SOURCES += \ - $$PWD/qqmldebugserver.cpp - -HEADERS += \ - $$PWD/qqmldebugserverfactory.h - -OTHER_FILES += \ - qqmldebugserver.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QQmlDebugServerFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro deleted file mode 100644 index a0e9d06fd5..0000000000 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = qmldbg_tcp -QT = qml-private network - -SOURCES += \ - $$PWD/qtcpserverconnection.cpp - -HEADERS += \ - $$PWD/qtcpserverconnectionfactory.h - -OTHER_FILES += \ - $$PWD/qtcpserverconnection.json - -PLUGIN_TYPE = qmltooling -PLUGIN_CLASS_NAME = QTcpServerConnectionFactory -load(qt_plugin) diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro deleted file mode 100644 index b5b6e5d7aa..0000000000 --- a/src/plugins/qmltooling/qmltooling.pro +++ /dev/null @@ -1,44 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += qml-private - -# Utilities -SUBDIRS += \ - packetprotocol - -# Connectors -SUBDIRS += qmldbg_native -qtConfig(thread): SUBDIRS += qmldbg_server - -qmldbg_native.depends = packetprotocol -qmldbg_server.depends = packetprotocol - -qtConfig(qml-network) { - qtConfig(localserver): SUBDIRS += qmldbg_local - - SUBDIRS += \ - qmldbg_tcp -} - -# Services -SUBDIRS += \ - qmldbg_messages \ - qmldbg_profiler \ - qmldbg_debugger \ - qmldbg_nativedebugger - -qmldbg_messages.depends = packetprotocol -qmldbg_profiler.depends = packetprotocol -qmldbg_debugger.depends = packetprotocol -qmldbg_nativedebugger.depends = packetprotocol - -qtHaveModule(quick) { - SUBDIRS += \ - qmldbg_inspector \ - qmldbg_quickprofiler - - qtConfig(settings):qtConfig(qml-network): SUBDIRS += qmldbg_preview - - qmldbg_inspector.depends = packetprotocol - qmldbg_quickprofiler.depends = packetprotocol - qmldbg_preview.depends = packetprotocol -} diff --git a/src/plugins/scenegraph/openvg/openvg.pro b/src/plugins/scenegraph/openvg/openvg.pro deleted file mode 100644 index 7f9f4bfec5..0000000000 --- a/src/plugins/scenegraph/openvg/openvg.pro +++ /dev/null @@ -1,72 +0,0 @@ -TARGET = qsgopenvgbackend - -QT += gui-private core-private qml-private quick-private - -PLUGIN_TYPE = scenegraph -PLUGIN_CLASS_NAME = QSGOpenVGAdaptation -load(qt_plugin) - -TRACEPOINT_PROVIDER = $$PWD/openvg.tracepoints -CONFIG += qt_tracepoints -debug_and_release { - CONFIG(debug, debug|release) { - INCLUDEPATH += $$OUT_PWD/../../../quick/.tracegen/debug - } else { - INCLUDEPATH += $$OUT_PWD/../../../quick/.tracegen/release - } -} else { - INCLUDEPATH += $$OUT_PWD/../../../quick/.tracegen/ -} - -QMAKE_TARGET_PRODUCT = "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)" -QMAKE_TARGET_DESCRIPTION = "Quick OpenVG Renderer for Qt." - -QMAKE_USE += openvg -CONFIG += egl - -OTHER_FILES += $$PWD/openvg.json - -HEADERS += \ - qsgopenvgadaptation_p.h \ - qsgopenvgcontext_p.h \ - qsgopenvgrenderloop_p.h \ - qsgopenvgglyphnode_p.h \ - qopenvgcontext_p.h \ - qsgopenvgrenderer_p.h \ - qsgopenvginternalrectanglenode.h \ - qsgopenvgnodevisitor.h \ - qopenvgmatrix.h \ - qsgopenvgpublicnodes.h \ - qsgopenvginternalimagenode.h \ - qsgopenvgtexture.h \ - qsgopenvglayer.h \ - qsgopenvghelpers.h \ - qsgopenvgfontglyphcache.h \ - qsgopenvgpainternode.h \ - qsgopenvgrenderable.h \ - qopenvgoffscreensurface.h - -SOURCES += \ - qsgopenvgadaptation.cpp \ - qsgopenvgcontext.cpp \ - qsgopenvgrenderloop.cpp \ - qsgopenvgglyphnode.cpp \ - qopenvgcontext.cpp \ - qsgopenvgrenderer.cpp \ - qsgopenvginternalrectanglenode.cpp \ - qsgopenvgnodevisitor.cpp \ - qopenvgmatrix.cpp \ - qsgopenvgpublicnodes.cpp \ - qsgopenvginternalimagenode.cpp \ - qsgopenvgtexture.cpp \ - qsgopenvglayer.cpp \ - qsgopenvghelpers.cpp \ - qsgopenvgfontglyphcache.cpp \ - qsgopenvgpainternode.cpp \ - qsgopenvgrenderable.cpp \ - qopenvgoffscreensurface.cpp - -qtConfig(quick-sprite) { - HEADERS += qsgopenvgspritenode.h - SOURCES += qsgopenvgspritenode.cpp -} diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro deleted file mode 100644 index 9cc521a191..0000000000 --- a/src/plugins/scenegraph/scenegraph.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += quick -qtConfig(openvg): SUBDIRS += openvg - diff --git a/src/qml/animations/animations.pri b/src/qml/animations/animations.pri deleted file mode 100644 index a379692567..0000000000 --- a/src/qml/animations/animations.pri +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/qabstractanimationjob_p.h \ - $$PWD/qanimationgroupjob_p.h \ - $$PWD/qsequentialanimationgroupjob_p.h \ - $$PWD/qparallelanimationgroupjob_p.h \ - $$PWD/qcontinuinganimationgroupjob_p.h \ - $$PWD/qpauseanimationjob_p.h \ - $$PWD/qanimationjobutil_p.h - -SOURCES += \ - $$PWD/qabstractanimationjob.cpp \ - $$PWD/qanimationgroupjob.cpp \ - $$PWD/qsequentialanimationgroupjob.cpp \ - $$PWD/qparallelanimationgroupjob.cpp \ - $$PWD/qcontinuinganimationgroupjob.cpp \ - $$PWD/qpauseanimationjob.cpp diff --git a/src/qml/common/common.pri b/src/qml/common/common.pri deleted file mode 100644 index 0456232162..0000000000 --- a/src/qml/common/common.pri +++ /dev/null @@ -1,40 +0,0 @@ -!build_pass { - # Create a header containing a hash that describes this library. For a - # released version of Qt, we'll use the .tag file that is updated by git - # archive with the commit hash. For unreleased versions, we'll ask git - # describe. Note that it won't update unless qmake is run again, even if - # the commit change also changed something in this library. - tagFile = $$PWD/../../.tag - tag = - exists($$tagFile) { - tag = $$cat($$tagFile, singleline) - QMAKE_INTERNAL_INCLUDED_FILES += $$tagFile - } - !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { - QML_COMPILE_HASH = $$tag - } else:exists($$PWD/../../.git) { - commit = $$system(git rev-parse HEAD) - QML_COMPILE_HASH = $$commit - } - compile_hash_contents = \ - "// Generated file, DO NOT EDIT" \ - "$${LITERAL_HASH}define QML_COMPILE_HASH \"$$QML_COMPILE_HASH\"" \ - "$${LITERAL_HASH}define QML_COMPILE_HASH_LENGTH $$str_size($$QML_COMPILE_HASH)" - write_file("$$OUT_PWD/qml_compile_hash_p.h", compile_hash_contents)|error() -} - -HEADERS += \ - $$PWD/qjsnumbercoercion.h \ - $$PWD/qqmlapiversion_p.h \ - $$PWD/qqmljsdiagnosticmessage_p.h \ - $$PWD/qqmljsfixedpoolarray_p.h \ - $$PWD/qqmljsmemorypool_p.h \ - $$PWD/qqmljssourcelocation_p.h \ - $$PWD/qv4alloca_p.h \ - $$PWD/qv4calldata_p.h \ - $$PWD/qv4compileddata_p.h \ - $$PWD/qv4staticvalue_p.h \ - $$PWD/qv4stringtoarrayindex_p.h - -SOURCES += \ - $$PWD/qjsnumbercoercion.cpp diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri deleted file mode 100644 index 4d6926d420..0000000000 --- a/src/qml/compiler/compiler.pri +++ /dev/null @@ -1,29 +0,0 @@ -INCLUDEPATH += $$PWD -INCLUDEPATH += $$OUT_PWD - -HEADERS += \ - $$PWD/qv4bytecodegenerator_p.h \ - $$PWD/qv4compiler_p.h \ - $$PWD/qv4compilercontext_p.h \ - $$PWD/qv4compilercontrolflow_p.h \ - $$PWD/qv4compilerglobal_p.h \ - $$PWD/qv4compilerscanfunctions_p.h \ - $$PWD/qv4codegen_p.h \ - $$PWD/qqmlirbuilder_p.h \ - $$PWD/qv4instr_moth_p.h \ - $$PWD/qv4bytecodehandler_p.h \ - $$PWD/qv4util_p.h - -SOURCES += \ - $$PWD/qv4bytecodegenerator.cpp \ - $$PWD/qv4compiler.cpp \ - $$PWD/qv4compilercontext.cpp \ - $$PWD/qv4compilerscanfunctions.cpp \ - $$PWD/qv4codegen.cpp \ - $$PWD/qqmlirbuilder.cpp \ - $$PWD/qv4instr_moth.cpp \ - $$PWD/qv4bytecodehandler.cpp - -gcc { - equals(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -fno-strict-aliasing -} diff --git a/src/qml/configure.pri b/src/qml/configure.pri deleted file mode 100644 index fcd2eacace..0000000000 --- a/src/qml/configure.pri +++ /dev/null @@ -1,22 +0,0 @@ -equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe - -defineTest(qtConfTest_detectPython) { - PYTHON_NAMES = python$$EXE_SUFFIX python2$${EXE_SUFFIX} python3$${EXE_SUFFIX} py$${EXE_SUFFIX} - for (name, PYTHON_NAMES) { - python_path = $$qtConfFindInPath("$$name") - !isEmpty(python_path): \ - break() - } - isEmpty(python_path) { - qtLog("No $$PYTHON_NAMES are found in PATH. Giving up.") - return(false) - } - - # Make tests.python.location available in configure.json. - $${1}.location = $$shell_path($$python_path) - export($${1}.location) - $${1}.cache += location - export($${1}.cache) - - return(true) -} diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri deleted file mode 100644 index 1281886816..0000000000 --- a/src/qml/debugger/debugger.pri +++ /dev/null @@ -1,28 +0,0 @@ -qtConfig(qml-debug) { - HEADERS += \ - $$PWD/qqmlabstractprofileradapter_p.h \ - $$PWD/qqmlconfigurabledebugservice_p.h \ - $$PWD/qqmldebugpluginmanager_p.h \ - $$PWD/qqmldebugservice_p.h \ - $$PWD/qqmldebugservicefactory_p.h \ - $$PWD/qqmldebugserver_p.h \ - $$PWD/qqmldebugserverconnection_p.h \ - $$PWD/qqmlprofilerdefinitions_p.h - - SOURCES += \ - $$PWD/qqmldebug.cpp \ - $$PWD/qqmldebugconnector.cpp \ - $$PWD/qqmldebugservice.cpp \ - $$PWD/qqmlabstractprofileradapter.cpp \ - $$PWD/qqmlprofiler.cpp \ - $$PWD/qqmldebugserviceinterfaces.cpp -} - -HEADERS += \ - $$PWD/qqmldebugconnector_p.h \ - $$PWD/qqmldebugserviceinterfaces_p.h \ - $$PWD/qqmldebugstatesdelegate_p.h \ - $$PWD/qqmldebug.h \ - $$PWD/qqmlprofiler_p.h - -INCLUDEPATH += $$PWD diff --git a/src/qml/doc/snippets/code/backend/backend.pro b/src/qml/doc/snippets/code/backend/backend.pro deleted file mode 100644 index 8bd2422718..0000000000 --- a/src/qml/doc/snippets/code/backend/backend.pro +++ /dev/null @@ -1,17 +0,0 @@ -QT += qml - -#![registration] -CONFIG += qmltypes -QML_IMPORT_NAME = io.qt.examples.backend -QML_IMPORT_MAJOR_VERSION = 1 -#![registration] - -HEADERS += \ - backend.h - -SOURCES += \ - backend.cpp \ - main.cpp - -RESOURCES += \ - main.qml diff --git a/src/qml/doc/snippets/code/doc_src_qtqml.pro b/src/qml/doc/snippets/code/doc_src_qtqml.pro deleted file mode 100644 index 48dc3ebf6c..0000000000 --- a/src/qml/doc/snippets/code/doc_src_qtqml.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [0] -QT += qml -#! [0] diff --git a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/scarceresources.pro b/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/scarceresources.pro deleted file mode 100644 index d88f8f574c..0000000000 --- a/src/qml/doc/snippets/qml/integrating-javascript/scarceresources/scarceresources.pro +++ /dev/null @@ -1,22 +0,0 @@ -QT += qml gui - -#![0] -CONFIG += qmltypes -QML_IMPORT_NAME = Qt.example -QML_IMPORT_MAJOR_VERSION = 1 -#![0] - -RESOURCES += \ - exampleFive.qml \ - exampleFour.js \ - exampleFour.qml \ - exampleOne.qml \ - exampleThree.js \ - exampleThree.qml \ - exampleTwo.qml - -HEADERS += \ - avatarExample.h - -SOURCES += \ - avatarExample.cpp diff --git a/src/qml/jit/jit.pri b/src/qml/jit/jit.pri deleted file mode 100644 index 503ce0ebcd..0000000000 --- a/src/qml/jit/jit.pri +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDEPATH += $$PWD -INCLUDEPATH += $$OUT_PWD - -SOURCES += \ - $$PWD/qv4baselinejit.cpp \ - $$PWD/qv4baselineassembler.cpp \ - $$PWD/qv4assemblercommon.cpp - -HEADERS += \ - $$PWD/qv4baselinejit_p.h \ - $$PWD/qv4baselineassembler_p.h \ - $$PWD/qv4assemblercommon_p.h diff --git a/src/qml/jsapi/jsapi.pri b/src/qml/jsapi/jsapi.pri deleted file mode 100644 index 3463a3aafe..0000000000 --- a/src/qml/jsapi/jsapi.pri +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES += \ - $$PWD/qjsengine.cpp \ - $$PWD/qjsmanagedvalue.cpp \ - $$PWD/qjsprimitivevalue.cpp \ - $$PWD/qjsvalue.cpp \ - $$PWD/qjsvalueiterator.cpp \ - -HEADERS += \ - $$PWD/qjsengine.h \ - $$PWD/qjsengine_p.h \ - $$PWD/qjsmanagedvalue.h \ - $$PWD/qjsprimitivevalue.h \ - $$PWD/qjsvalue.h \ - $$PWD/qjsvalue_p.h \ - $$PWD/qjsvalueiterator.h \ - $$PWD/qjsvalueiterator_p.h diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri deleted file mode 100644 index 39391be976..0000000000 --- a/src/qml/jsruntime/jsruntime.pri +++ /dev/null @@ -1,179 +0,0 @@ -INCLUDEPATH += $$PWD -INCLUDEPATH += $$OUT_PWD - -SOURCES += \ - $$PWD/qv4engine.cpp \ - $$PWD/qv4context.cpp \ - $$PWD/qv4persistent.cpp \ - $$PWD/qv4lookup.cpp \ - $$PWD/qv4identifierhash.cpp \ - $$PWD/qv4identifiertable.cpp \ - $$PWD/qv4managed.cpp \ - $$PWD/qv4internalclass.cpp \ - $$PWD/qv4sparsearray.cpp \ - $$PWD/qv4atomics.cpp \ - $$PWD/qv4arraydata.cpp \ - $$PWD/qv4arrayobject.cpp \ - $$PWD/qv4arrayiterator.cpp \ - $$PWD/qv4argumentsobject.cpp \ - $$PWD/qv4booleanobject.cpp \ - $$PWD/qv4dateobject.cpp \ - $$PWD/qv4errorobject.cpp \ - $$PWD/qv4function.cpp \ - $$PWD/qv4functionobject.cpp \ - $$PWD/qv4generatorobject.cpp \ - $$PWD/qv4globalobject.cpp \ - $$PWD/qv4iterator.cpp \ - $$PWD/qv4jsonobject.cpp \ - $$PWD/qv4mathobject.cpp \ - $$PWD/qv4memberdata.cpp \ - $$PWD/qv4numberobject.cpp \ - $$PWD/qv4object.cpp \ - $$PWD/qv4objectproto.cpp \ - $$PWD/qv4propertykey.cpp \ - $$PWD/qv4proxy.cpp \ - $$PWD/qv4qmlcontext.cpp \ - $$PWD/qv4reflect.cpp \ - $$PWD/qv4regexpobject.cpp \ - $$PWD/qv4stackframe.cpp \ - $$PWD/qv4string.cpp \ - $$PWD/qv4stringiterator.cpp \ - $$PWD/qv4stringobject.cpp \ - $$PWD/qv4variantobject.cpp \ - $$PWD/qv4objectiterator.cpp \ - $$PWD/qv4regexp.cpp \ - $$PWD/qv4runtimecodegen.cpp \ - $$PWD/qv4script.cpp \ - $$PWD/qv4symbol.cpp \ - $$PWD/qv4setobject.cpp \ - $$PWD/qv4setiterator.cpp \ - $$PWD/qv4include.cpp \ - $$PWD/qv4qobjectwrapper.cpp \ - $$PWD/qv4arraybuffer.cpp \ - $$PWD/qv4typedarray.cpp \ - $$PWD/qv4dataview.cpp \ - $$PWD/qv4vme_moth.cpp \ - $$PWD/qv4mapobject.cpp \ - $$PWD/qv4mapiterator.cpp \ - $$PWD/qv4estable.cpp \ - $$PWD/qv4module.cpp \ - $$PWD/qv4promiseobject.cpp \ - $$PWD/qv4runtime.cpp \ - $$PWD/qv4urlobject.cpp \ - $$PWD/qv4value.cpp \ - $$PWD/qv4compilationunitmapper.cpp \ - $$PWD/qv4executablecompilationunit.cpp \ - $$PWD/qv4executableallocator.cpp \ - $$PWD/qv4resolvedtypereference.cpp - -qtConfig(qml-debug): SOURCES += $$PWD/qv4profiling.cpp - -HEADERS += \ - $$PWD/qv4global_p.h \ - $$PWD/qv4engine_p.h \ - $$PWD/qv4enginebase_p.h \ - $$PWD/qv4context_p.h \ - $$PWD/qv4math_p.h \ - $$PWD/qv4persistent_p.h \ - $$PWD/qv4debugging_p.h \ - $$PWD/qv4lookup_p.h \ - $$PWD/qv4identifierhashdata_p.h \ - $$PWD/qv4identifierhash_p.h \ - $$PWD/qv4identifiertable_p.h \ - $$PWD/qv4managed_p.h \ - $$PWD/qv4internalclass_p.h \ - $$PWD/qv4jscall_p.h \ - $$PWD/qv4sparsearray_p.h \ - $$PWD/qv4atomics_p.h \ - $$PWD/qv4arraydata_p.h \ - $$PWD/qv4arrayobject_p.h \ - $$PWD/qv4arrayiterator_p.h \ - $$PWD/qv4argumentsobject_p.h \ - $$PWD/qv4booleanobject_p.h \ - $$PWD/qv4dateobject_p.h \ - $$PWD/qv4errorobject_p.h \ - $$PWD/qv4function_p.h \ - $$PWD/qv4functionobject_p.h \ - $$PWD/qv4generatorobject_p.h \ - $$PWD/qv4globalobject_p.h \ - $$PWD/qv4iterator_p.h \ - $$PWD/qv4jsonobject_p.h \ - $$PWD/qv4mathobject_p.h \ - $$PWD/qv4memberdata_p.h \ - $$PWD/qv4numberobject_p.h \ - $$PWD/qv4object_p.h \ - $$PWD/qv4objectproto_p.h \ - $$PWD/qv4propertykey_p.h \ - $$PWD/qv4proxy_p.h \ - $$PWD/qv4qmlcontext_p.h \ - $$PWD/qv4reflect_p.h \ - $$PWD/qv4regexpobject_p.h \ - $$PWD/qv4runtimecodegen_p.h \ - $$PWD/qv4stackframe_p.h \ - $$PWD/qv4string_p.h \ - $$PWD/qv4stringiterator_p.h \ - $$PWD/qv4stringobject_p.h \ - $$PWD/qv4variantobject_p.h \ - $$PWD/qv4property_p.h \ - $$PWD/qv4objectiterator_p.h \ - $$PWD/qv4regexp_p.h \ - $$PWD/qv4script_p.h \ - $$PWD/qv4symbol_p.h \ - $$PWD/qv4setobject_p.h \ - $$PWD/qv4setiterator_p.h \ - $$PWD/qv4scopedvalue_p.h \ - $$PWD/qv4executableallocator_p.h \ - $$PWD/qv4include_p.h \ - $$PWD/qv4qobjectwrapper_p.h \ - $$PWD/qv4profiling_p.h \ - $$PWD/qv4arraybuffer_p.h \ - $$PWD/qv4typedarray_p.h \ - $$PWD/qv4dataview_p.h \ - $$PWD/qv4vme_moth_p.h \ - $$PWD/qv4mapobject_p.h \ - $$PWD/qv4mapiterator_p.h \ - $$PWD/qv4estable_p.h \ - $$PWD/qv4vtable_p.h \ - $$PWD/qv4module_p.h \ - $$PWD/qv4promiseobject_p.h \ - $$PWD/qv4runtime_p.h \ - $$PWD/qv4urlobject_p.h \ - $$PWD/qv4value_p.h \ - $$PWD/qv4compilationunitmapper_p.h \ - $$PWD/qv4executablecompilationunit_p.h \ - $$PWD/qv4functiontable_p.h \ - $$PWD/qv4runtimeapi_p.h \ - $$PWD/qv4resolvedtypereference_p.h - -qtConfig(qml-sequence-object) { - HEADERS += \ - $$PWD/qv4sequenceobject_p.h - - SOURCES += \ - $$PWD/qv4sequenceobject.cpp -} - -unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp -else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp - -win32 { - equals(QT_ARCH, x86_64) { - SOURCES += \ - $$PWD/qv4functiontable_win64.cpp - } else { - SOURCES += \ - $$PWD/qv4functiontable_noop.cpp - } -} else { - SOURCES += \ - $$PWD/qv4functiontable_unix.cpp -} - - -valgrind { - DEFINES += V4_USE_VALGRIND -} - -heaptrack { - DEFINES += V4_USE_HEAPTRACK -} diff --git a/src/qml/memory/memory.pri b/src/qml/memory/memory.pri deleted file mode 100644 index 0bc8e90d27..0000000000 --- a/src/qml/memory/memory.pri +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDEPATH += $$PWD -INCLUDEPATH += $$OUT_PWD - -SOURCES += \ - $$PWD/qv4mm.cpp \ - -HEADERS += \ - $$PWD/qv4mm_p.h \ - $$PWD/qv4mmdefs_p.h \ - $$PWD/qv4writebarrier_p.h \ - $$PWD/qv4heap_p.h diff --git a/src/qml/parser/parser.pri b/src/qml/parser/parser.pri deleted file mode 100644 index 57855a82f9..0000000000 --- a/src/qml/parser/parser.pri +++ /dev/null @@ -1,23 +0,0 @@ -HEADERS += \ - $$PWD/qqmljsast_p.h \ - $$PWD/qqmljsastfwd_p.h \ - $$PWD/qqmljsastvisitor_p.h \ - $$PWD/qqmljsengine_p.h \ - $$PWD/qqmljslexer_p.h \ - $$PWD/qqmljsglobal_p.h \ - $$PWD/qqmljskeywords_p.h - -SOURCES += \ - $$PWD/qqmljsast.cpp \ - $$PWD/qqmljsastvisitor.cpp \ - $$PWD/qqmljsengine_p.cpp \ - $$PWD/qqmljslexer.cpp \ - -CONFIG += qlalr -QLALRSOURCES = $$PWD/qqmljs.g -QMAKE_QLALRFLAGS = --no-debug --qt - -OTHER_FILES += $$QLALRSOURCES - -# make sure we install the headers generated by qlalr -private_headers.CONFIG += no_check_exist diff --git a/src/qml/qml.pro b/src/qml/qml.pro deleted file mode 100644 index 0ef8f9e928..0000000000 --- a/src/qml/qml.pro +++ /dev/null @@ -1,81 +0,0 @@ -TARGET = QtQml -QT = core-private - -qtConfig(qml-network): \ - QT += network - -TRACEPOINT_PROVIDER = $$PWD/qtqml.tracepoints -CONFIG += qt_tracepoints - -!qtConfig(qml-python): \ - error(Python is required to build QtQml.) - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES - -msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000 -msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS -win32:LIBS += -lshell32 -solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - -# Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. -gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks - -DEFINES += QT_NO_FOREACH - -exists("qqml_enable_gcov") { - QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors - LIBS_PRIVATE += -lgcov -} - -# QTBUG-55238, disable new optimizer for MSVC 2015/Update 3. -release:msvc:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ - greaterThan(QT_CL_PATCH_VERSION, 24212):QMAKE_CXXFLAGS += -d2SSAOptimizer- - -QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf - -# 2415: variable "xx" of static storage duration was declared but never referenced -intel_icc: WERROR += -ww2415 -# unused variable 'xx' [-Werror,-Wunused-const-variable] -greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)| \ - greaterThan(QT_APPLE_CLANG_MAJOR_VERSION, 5)| \ - if(equals(QT_APPLE_CLANG_MAJOR_VERSION, 5):greaterThan(QT_APPLE_CLANG_MINOR_VERSION, 0)): \ - WERROR += -Wno-error=unused-const-variable - -HEADERS += qtqmlglobal.h \ - inlinecomponentutils_p.h \ - qtqmlglobal_p.h \ - qtqmlcompilerglobal.h \ - qtqmlcompilerglobal_p.h - -#modules -include(common/common.pri) -include(util/util.pri) -include(memory/memory.pri) -include(parser/parser.pri) -include(compiler/compiler.pri) -include(jsapi/jsapi.pri) -include(jsruntime/jsruntime.pri) -qtConfig(qml-jit) { - include(jit/jit.pri) -} -include(qml/qml.pri) -include(debugger/debugger.pri) -include(qmldirparser/qmldirparser.pri) -qtConfig(qml-animation) { - include(animations/animations.pri) -} -include(types/types.pri) -include(../3rdparty/masm/masm-defs.pri) - -MODULE_PLUGIN_TYPES = \ - qmltooling - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml -QML_IMPORT_NAME = QtQml -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes - -load(qt_module) - -include(../3rdparty/masm/masm.pri) diff --git a/src/qml/qml/ftw/ftw.pri b/src/qml/qml/ftw/ftw.pri deleted file mode 100644 index eadba394b4..0000000000 --- a/src/qml/qml/ftw/ftw.pri +++ /dev/null @@ -1,26 +0,0 @@ -HEADERS += \ - $$PWD/qbitfield_p.h \ - $$PWD/qintrusivelist_p.h \ - $$PWD/qpodvector_p.h \ - $$PWD/qhashedstring_p.h \ - $$PWD/qprimefornumbits_p.h \ - $$PWD/qqmlrefcount_p.h \ - $$PWD/qfieldlist_p.h \ - $$PWD/qqmlthread_p.h \ - $$PWD/qfinitestack_p.h \ - $$PWD/qrecursionwatcher_p.h \ - $$PWD/qrecyclepool_p.h \ - $$PWD/qflagpointer_p.h \ - $$PWD/qlazilyallocated_p.h \ - $$PWD/qqmlnullablevalue_p.h \ - $$PWD/qstringhash_p.h \ - $$PWD/qlinkedstringhash_p.h - -SOURCES += \ - $$PWD/qintrusivelist.cpp \ - $$PWD/qhashedstring.cpp \ - $$PWD/qqmlthread.cpp - -# mirrors logic in $$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri -# clock_gettime() is implemented in librt on these systems -qtConfig(clock-gettime):linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri deleted file mode 100644 index ab5dedc061..0000000000 --- a/src/qml/qml/qml.pri +++ /dev/null @@ -1,193 +0,0 @@ -SOURCES += \ - $$PWD/qqml.cpp \ - $$PWD/qqmldatablob.cpp \ - $$PWD/qqmldirdata.cpp \ - $$PWD/qqmlerror.cpp \ - $$PWD/qqmlmoduleregistration.cpp \ - $$PWD/qqmlopenmetaobject.cpp \ - $$PWD/qqmlscriptblob.cpp \ - $$PWD/qqmlscriptdata.cpp \ - $$PWD/qqmltypedata.cpp \ - $$PWD/qqmltypeloaderqmldircontent.cpp \ - $$PWD/qqmltypeloaderthread.cpp \ - $$PWD/qqmlvmemetaobject.cpp \ - $$PWD/qqmlengine.cpp \ - $$PWD/qqmlexpression.cpp \ - $$PWD/qqmlproperty.cpp \ - $$PWD/qqmlcomponent.cpp \ - $$PWD/qqmlincubator.cpp \ - $$PWD/qqmlcontext.cpp \ - $$PWD/qqmlcontextdata.cpp \ - $$PWD/qqmlcustomparser.cpp \ - $$PWD/qqmlpropertyvaluesource.cpp \ - $$PWD/qqmlpropertyvalueinterceptor.cpp \ - $$PWD/qqmlproxymetaobject.cpp \ - $$PWD/qqmlvme.cpp \ - $$PWD/qqmlboundsignal.cpp \ - $$PWD/qqmlmetatype.cpp \ - $$PWD/qqmlmetatypedata.cpp \ - $$PWD/qqmlstringconverters.cpp \ - $$PWD/qqmltype.cpp \ - $$PWD/qqmltypemodule.cpp \ - $$PWD/qqmltypemoduleversion.cpp \ - $$PWD/qqmlparserstatus.cpp \ - $$PWD/qqmltypeloader.cpp \ - $$PWD/qqmlinfo.cpp \ - $$PWD/qqmlvaluetype.cpp \ - $$PWD/qqmlpropertycache.cpp \ - $$PWD/qqmlmetaobject.cpp \ - $$PWD/qqmlnotifier.cpp \ - $$PWD/qqmlobjectorgadget.cpp \ - $$PWD/qqmltypenotavailable.cpp \ - $$PWD/qqmltypenamecache.cpp \ - $$PWD/qqmlscriptstring.cpp \ - $$PWD/qqmlnetworkaccessmanagerfactory.cpp \ - $$PWD/qqmlextensionplugin.cpp \ - $$PWD/qqmlimport.cpp \ - $$PWD/qqmllist.cpp \ - $$PWD/qqmljavascriptexpression.cpp \ - $$PWD/qqmlabstractbinding.cpp \ - $$PWD/qqmlvaluetypeproxybinding.cpp \ - $$PWD/qqmlglobal.cpp \ - $$PWD/qqmlfile.cpp \ - $$PWD/qqmlplatform.cpp \ - $$PWD/qqmlbinding.cpp \ - $$PWD/qqmlpropertybinding.cpp \ - $$PWD/qqmlabstracturlinterceptor.cpp \ - $$PWD/qqmlapplicationengine.cpp \ - $$PWD/qqmllistwrapper.cpp \ - $$PWD/qqmlvaluetypewrapper.cpp \ - $$PWD/qqmltypewrapper.cpp \ - $$PWD/qqmlfileselector.cpp \ - $$PWD/qqmlobjectcreator.cpp \ - $$PWD/qqmldelayedcallqueue.cpp \ - $$PWD/qqmlloggingcategory.cpp \ - $$PWD/qqmlirloader.cpp \ - $$PWD/qqmlpropertyresolver.cpp \ - $$PWD/qqmltypecompiler.cpp \ - $$PWD/qqmlpropertycachecreator.cpp \ - $$PWD/qqmlpropertyvalidator.cpp - -HEADERS += \ - $$PWD/qqmldatablob_p.h \ - $$PWD/qqmldirdata_p.h \ - $$PWD/qqmlglobal_p.h \ - $$PWD/qqmlmoduleregistration.h \ - $$PWD/qqmlopenmetaobject_p.h \ - $$PWD/qqmlscriptblob_p.h \ - $$PWD/qqmlscriptdata_p.h \ - $$PWD/qqmltypedata_p.h \ - $$PWD/qqmltypeloaderqmldircontent_p.h \ - $$PWD/qqmltypeloaderthread_p.h \ - $$PWD/qqmlvmemetaobject_p.h \ - $$PWD/qqml.h \ - $$PWD/qqmlerror.h \ - $$PWD/qqmlproperty.h \ - $$PWD/qqmlcomponent.h \ - $$PWD/qqmlcomponent_p.h \ - $$PWD/qqmlincubator.h \ - $$PWD/qqmlincubator_p.h \ - $$PWD/qqmlcustomparser_p.h \ - $$PWD/qqmlpropertyvaluesource.h \ - $$PWD/qqmlpropertyvalueinterceptor_p.h \ - $$PWD/qqmlboundsignal_p.h \ - $$PWD/qqmlparserstatus.h \ - $$PWD/qqmlproxymetaobject_p.h \ - $$PWD/qqmlvme_p.h \ - $$PWD/qqmlengine_p.h \ - $$PWD/qqmlexpression_p.h \ - $$PWD/qqmlprivate.h \ - $$PWD/qqmlmetatype_p.h \ - $$PWD/qqmlmetatypedata_p.h \ - $$PWD/qqmltype_p.h \ - $$PWD/qqmltype_p_p.h \ - $$PWD/qqmltypemodule_p.h \ - $$PWD/qqmltypemoduleversion_p.h \ - $$PWD/qqmlengine.h \ - $$PWD/qqmlcontext.h \ - $$PWD/qqmlexpression.h \ - $$PWD/qqmlstringconverters_p.h \ - $$PWD/qqmlinfo.h \ - $$PWD/qqmlproperty_p.h \ - $$PWD/qqmlcontext_p.h \ - $$PWD/qqmlcontextdata_p.h \ - $$PWD/qqmlguardedcontextdata_p.h \ - $$PWD/qqmltypeloader_p.h \ - $$PWD/qqmllist.h \ - $$PWD/qqmllist_p.h \ - $$PWD/qqmldata_p.h \ - $$PWD/qqmlvaluetype_p.h \ - $$PWD/qqmlenumdata_p.h \ - $$PWD/qqmlenumvalue_p.h \ - $$PWD/qqmlpropertycache_p.h \ - $$PWD/qqmlpropertycachemethodarguments_p.h \ - $$PWD/qqmlpropertycachevector_p.h \ - $$PWD/qqmlpropertydata_p.h \ - $$PWD/qqmlpropertyindex_p.h \ - $$PWD/qqmlmetaobject_p.h \ - $$PWD/qqmlnotifier_p.h \ - $$PWD/qqmlobjectorgadget_p.h \ - $$PWD/qqmltypenotavailable_p.h \ - $$PWD/qqmltypenamecache_p.h \ - $$PWD/qqmlscriptstring.h \ - $$PWD/qqmlguard_p.h \ - $$PWD/qqmlnetworkaccessmanagerfactory.h \ - $$PWD/qqmlextensioninterface.h \ - $$PWD/qqmlimport_p.h \ - $$PWD/qqmlextensionplugin.h \ - $$PWD/qqmlscriptstring_p.h \ - $$PWD/qqmlcomponentattached_p.h \ - $$PWD/qqmljavascriptexpression_p.h \ - $$PWD/qqmlabstractbinding_p.h \ - $$PWD/qqmlvaluetypeproxybinding_p.h \ - $$PWD/qqmlfile.h \ - $$PWD/qqmlplatform_p.h \ - $$PWD/qqmlbinding_p.h \ - $$PWD/qqmlpropertybinding_p.h \ - $$PWD/qqmlextensionplugin_p.h \ - $$PWD/qqmlabstracturlinterceptor.h \ - $$PWD/qqmlapplicationengine_p.h \ - $$PWD/qqmlapplicationengine.h \ - $$PWD/qqmllistwrapper_p.h \ - $$PWD/qqmltypewrapper_p.h \ - $$PWD/qqmlfileselector_p.h \ - $$PWD/qqmlfileselector.h \ - $$PWD/qqmlobjectcreator_p.h \ - $$PWD/qqmldelayedcallqueue_p.h \ - $$PWD/qqmlloggingcategory_p.h \ - $$PWD/qqmlirloader_p.h \ - $$PWD/qqmlpropertyresolver_p.h \ - $$PWD/qqmltypecompiler_p.h \ - $$PWD/qqmlpropertycachecreator_p.h \ - $$PWD/qqmlpropertyvalidator_p.h \ - $$PWD/qqmlsourcecoordinate_p.h - -qtConfig(qml-xml-http-request) { - HEADERS += \ - $$PWD/qqmlxmlhttprequest_p.h - - SOURCES += \ - $$PWD/qqmlxmlhttprequest.cpp - -} - -qtConfig(qml-locale) { - HEADERS += \ - $$PWD/qqmllocale_p.h - - SOURCES += \ - $$PWD/qqmllocale.cpp -} - -qtConfig(qml-network) { - HEADERS += \ - $$PWD/qqmltypeloadernetworkreplyproxy_p.h - - SOURCES += \ - $$PWD/qqmltypeloadernetworkreplyproxy.cpp -} - -android: DEFINES += LIBS_SUFFIX='\\"_$${QT_ARCH}.so\\"' - -include(ftw/ftw.pri) -include(v8/v8.pri) diff --git a/src/qml/qml/v8/v8.pri b/src/qml/qml/v8/v8.pri deleted file mode 100644 index fbcc47de0c..0000000000 --- a/src/qml/qml/v8/v8.pri +++ /dev/null @@ -1,9 +0,0 @@ -HEADERS += \ - $$PWD/qv4domerrors_p.h \ - $$PWD/qv4sqlerrors_p.h \ - $$PWD/qqmlbuiltinfunctions_p.h - -SOURCES += \ - $$PWD/qv4domerrors.cpp \ - $$PWD/qv4sqlerrors.cpp \ - $$PWD/qqmlbuiltinfunctions.cpp diff --git a/src/qml/qmldirparser/qmldirparser.pri b/src/qml/qmldirparser/qmldirparser.pri deleted file mode 100644 index 3923208e4a..0000000000 --- a/src/qml/qmldirparser/qmldirparser.pri +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDEPATH += $$PWD -INCLUDEPATH += $$OUT_PWD - -HEADERS += \ - $$PWD/qqmldirparser_p.h \ - $$PWD/qqmlimportresolver_p.h - -SOURCES += \ - $$PWD/qqmldirparser.cpp \ - $$PWD/qqmlimportresolver.cpp diff --git a/src/qml/types/types.pri b/src/qml/types/types.pri deleted file mode 100644 index 54cd8710b6..0000000000 --- a/src/qml/types/types.pri +++ /dev/null @@ -1,22 +0,0 @@ -SOURCES += \ - $$PWD/qqmlbind.cpp \ - $$PWD/qqmlconnections.cpp - -HEADERS += \ - $$PWD/qqmlbind_p.h \ - $$PWD/qqmlconnections_p.h - -qtConfig(qml-itemmodel) { - SOURCES += \ - $$PWD/qqmlmodelindexvaluetype.cpp - HEADERS += \ - $$PWD/qqmlmodelindexvaluetype_p.h -} - -qtConfig(qml-animation) { - SOURCES += \ - $$PWD/qqmltimer.cpp - - HEADERS += \ - $$PWD/qqmltimer_p.h -} diff --git a/src/qml/util/util.pri b/src/qml/util/util.pri deleted file mode 100644 index 3b121ba3cb..0000000000 --- a/src/qml/util/util.pri +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += \ - $$PWD/qqmlpropertymap.cpp - -HEADERS += \ - $$PWD/qqmlpropertymap.h diff --git a/src/qmlcompiler/qmlcompiler.pro b/src/qmlcompiler/qmlcompiler.pro deleted file mode 100644 index 0ae78e6cd0..0000000000 --- a/src/qmlcompiler/qmlcompiler.pro +++ /dev/null @@ -1,32 +0,0 @@ -option(host_build) -TARGET = QtQmlCompiler -QT = core-private qmldevtools-private -CONFIG += internal_module - -SOURCES = \ - qqmljsresourcefilemapper.cpp \ - qqmljsimportvisitor.cpp \ - qqmljsimporter.cpp \ - qqmljstypereader.cpp \ - qqmljsscope.cpp \ - qqmljstypedescriptionreader.cpp \ - qqmljsstreamwriter.cpp \ - qqmljsloadergenerator.cpp \ - qqmljscompiler.cpp \ - qresourcerelocater.cpp - -HEADERS = \ - qdeferredpointer_p.h \ - qqmljsresourcefilemapper_p.h \ - qqmljsimportvisitor_p.h \ - qqmljsimporter_p.h \ - qqmljstypereader_p.h \ - qqmljsmetatypes_p.h \ - qqmljsscope_p.h \ - qqmljstypedescriptionreader_p.h \ - qqmljsstreamwriter_p.h \ - qqmljsloadergenerator_p.h \ - qqmljscompiler_p.h \ - qresourcerelocater_p.h - -load(qt_module) diff --git a/src/qmldebug/qmldebug.pro b/src/qmldebug/qmldebug.pro deleted file mode 100644 index ac3f3bf3bf..0000000000 --- a/src/qmldebug/qmldebug.pro +++ /dev/null @@ -1,46 +0,0 @@ -TARGET = QtQmlDebug -QT = core-private qml-private network packetprotocol-private -CONFIG += static internal_module - -load(qt_module) - -SOURCES += \ - qqmldebugclient.cpp \ - qqmldebugconnection.cpp \ - qqmldebugmessageclient.cpp \ - qqmldebugtranslationclient.cpp \ - qqmlenginecontrolclient.cpp \ - qqmlenginedebugclient.cpp \ - qqmlinspectorclient.cpp \ - qqmlpreviewclient.cpp \ - qqmlprofilerclient.cpp \ - qqmlprofilerevent.cpp \ - qqmlprofilereventlocation.cpp \ - qqmlprofilereventtype.cpp \ - qqmlprofilertypedevent.cpp \ - qv4debugclient.cpp - -HEADERS += \ - qqmldebugclient_p.h \ - qqmldebugclient_p_p.h \ - qqmldebugconnection_p.h \ - qqmldebugmessageclient_p.h \ - qqmldebugtranslationclient_p.h \ - qqmlenginedebugclient_p.h \ - qqmlenginedebugclient_p_p.h \ - qqmlenginecontrolclient_p.h \ - qqmlenginecontrolclient_p_p.h \ - qqmlinspectorclient_p.h \ - qqmlinspectorclient_p_p.h \ - qqmlpreviewclient_p.h \ - qqmlpreviewclient_p_p.h \ - qqmlprofilerclient_p.h \ - qqmlprofilerclient_p_p.h \ - qqmlprofilerevent_p.h \ - qqmlprofilereventlocation_p.h \ - qqmlprofilereventreceiver_p.h \ - qqmlprofilereventtype_p.h \ - qqmlprofilertypedevent_p.h \ - qqmlprofilerclientdefinitions_p.h \ - qv4debugclient_p.h \ - qv4debugclient_p_p.h diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro deleted file mode 100644 index bea3c864cd..0000000000 --- a/src/qmldevtools/qmldevtools.pro +++ /dev/null @@ -1,20 +0,0 @@ -option(host_build) -TARGET = QtQmlDevTools -QT = core-private -CONFIG += minimal_syncqt internal_module generated_privates - -MODULE_INCNAME = QtQml -INCLUDEPATH += $$OUT_PWD/../qml - -# 2415: variable "xx" of static storage duration was declared but never referenced -# unused variable 'xx' [-Werror,-Wunused-const-variable] -intel_icc: WERROR += -ww2415 -clang:if(greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)): \ - WERROR += -Wno-error=unused-const-variable - -include(../qml/common/common.pri) -include(../qml/parser/parser.pri) -include(../qml/compiler/compiler.pri) -include(../qml/qmldirparser/qmldirparser.pri) - -load(qt_module) diff --git a/src/qmldom/qmldom.pro b/src/qmldom/qmldom.pro deleted file mode 100644 index 9f64ff599f..0000000000 --- a/src/qmldom/qmldom.pro +++ /dev/null @@ -1,27 +0,0 @@ -option(host_build) -TARGET = QtQmlDom -QT = core-private qmldevtools-private -CONFIG += minimal_syncqt internal_module generated_privates - -DEFINES += QMLDOM_LIBRARY - -SOURCES += \ - $$PWD/qqmldomerrormessage.cpp \ - $$PWD/qqmldomexternalitems.cpp \ - $$PWD/qqmldomitem.cpp \ - $$PWD/qqmldompath.cpp \ - $$PWD/qqmldomtop.cpp \ - $$PWD/qqmldomstringdumper.cpp - -HEADERS += \ - $$PWD/qqmldom_fwd_p.h \ - $$PWD/qqmldom_global.h \ - $$PWD/qqmldomconstants_p.h \ - $$PWD/qqmldomerrormessage_p.h \ - $$PWD/qqmldomexternalitems_p.h \ - $$PWD/qqmldomitem_p.h \ - $$PWD/qqmldompath_p.h \ - $$PWD/qqmldomtop_p.h \ - $$PWD/qqmldomstringdumper_p.h - -load(qt_module) diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro deleted file mode 100644 index 34380ee14e..0000000000 --- a/src/qmlmodels/qmlmodels.pro +++ /dev/null @@ -1,72 +0,0 @@ -TARGET = QtQmlModels -QT = core-private qml-private - -QMAKE_DOCS = $$PWD/doc/qtqmlmodels.qdocconf - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FOREACH - -HEADERS += \ - $$PWD/qqmlchangeset_p.h \ - $$PWD/qqmlmodelsmodule_p.h \ - $$PWD/qtqmlmodelsglobal_p.h \ - $$PWD/qtqmlmodelsglobal.h - -SOURCES += \ - $$PWD/qqmlchangeset.cpp - -qtConfig(qml-object-model) { - SOURCES += \ - $$PWD/qqmlinstantiator.cpp \ - $$PWD/qqmlobjectmodel.cpp - - HEADERS += \ - $$PWD/qqmlinstantiator_p.h \ - $$PWD/qqmlinstantiator_p_p.h \ - $$PWD/qqmlobjectmodel_p.h -} - -qtConfig(qml-table-model) { - SOURCES += \ - $$PWD/qqmltableinstancemodel.cpp - - HEADERS += \ - $$PWD/qqmltableinstancemodel_p.h -} - -qtConfig(qml-list-model) { - SOURCES += \ - $$PWD/qqmllistmodel.cpp \ - $$PWD/qqmllistmodelworkeragent.cpp - - HEADERS += \ - $$PWD/qqmllistmodel_p.h \ - $$PWD/qqmllistmodel_p_p.h \ - $$PWD/qqmllistmodelworkeragent_p.h -} - -qtConfig(qml-delegate-model) { - SOURCES += \ - $$PWD/qqmlabstractdelegatecomponent.cpp \ - $$PWD/qqmladaptormodel.cpp \ - $$PWD/qqmldelegatemodel.cpp \ - $$PWD/qqmllistaccessor.cpp \ - $$PWD/qqmllistcompositor.cpp \ - $$PWD/qquickpackage.cpp - - HEADERS += \ - $$PWD/qqmlabstractdelegatecomponent_p.h \ - $$PWD/qqmladaptormodel_p.h \ - $$PWD/qqmldelegatemodel_p.h \ - $$PWD/qqmldelegatemodel_p_p.h \ - $$PWD/qqmllistaccessor_p.h \ - $$PWD/qqmllistcompositor_p.h \ - $$PWD/qquickpackage_p.h -} - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models -QML_IMPORT_NAME = QtQml.Models -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes - -load(qt_module) diff --git a/src/qmltest/doc/snippets/snippets.pro b/src/qmltest/doc/snippets/snippets.pro deleted file mode 100644 index cf47e4efce..0000000000 --- a/src/qmltest/doc/snippets/snippets.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = lib - -QT += qml qmltest - -TARGET = qtquick_test_snippets - -SOURCES += src_qmltest_qquicktest.cpp diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro deleted file mode 100644 index 2f26448707..0000000000 --- a/src/qmltest/qmltest.pro +++ /dev/null @@ -1,38 +0,0 @@ -TARGET = QtQuickTest - -QMAKE_DOCS = $$PWD/doc/qtqmltest.qdocconf - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_FOREACH -QT = core testlib-private -QT_PRIVATE = quick quick-private qml-private gui core-private - -# Testlib is only a private dependency, which results in our users not -# inheriting testlibs's MODULE_CONFIG transitively. Make it explicit. -MODULE_CONFIG += $${QT.testlib.CONFIG} - -qtHaveModule(widgets) { - QT += widgets - DEFINES += QT_QMLTEST_WITH_WIDGETS -} - -SOURCES += \ - $$PWD/quicktest.cpp \ - $$PWD/quicktestresult.cpp - -HEADERS += \ - $$PWD/quicktestglobal.h \ - $$PWD/quicktest.h \ - $$PWD/quicktest_p.h \ - $$PWD/quicktestresult_p.h \ - $$PWD/qtestoptions_p.h - -qtConfig(qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING - -load(qt_module) - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtTest -QML_IMPORT_NAME = QtTest -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes - diff --git a/src/qmltyperegistrar/qmltyperegistrar.pro b/src/qmltyperegistrar/qmltyperegistrar.pro deleted file mode 100644 index 006760994f..0000000000 --- a/src/qmltyperegistrar/qmltyperegistrar.pro +++ /dev/null @@ -1,40 +0,0 @@ -option(host_build) - -QT = core-private -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - -QMAKE_TARGET_DESCRIPTION = QML Types Registrar - -# We cannot link against libQmlCompiler as qmltyperegistrar -# has to be built before libQmlCompiler. - -INCLUDEPATH += $$PWD/../qmlcompiler - -SOURCES += \ - ../qmlcompiler/qqmljsstreamwriter.cpp \ - qmltyperegistrar.cpp \ - qmltypesclassdescription.cpp \ - qmltypescreator.cpp \ - metatypesjsonprocessor.cpp - - -HEADERS += \ - ../qmlcompiler/qqmljsstreamwriter_p.h \ - qmltypesclassdescription.h \ - qmltypescreator.h \ - metatypesjsonprocessor.h - -build_integration.files = qmltypes.prf -build_integration.path = $$[QT_HOST_DATA]/mkspecs/features - -prefix_build { - load(qt_build_paths) - qmltypes_to_builddir.files = qmltypes.prf - qmltypes_to_builddir.path = $$MODULE_BASE_OUTDIR/mkspecs/features - COPIES += qmltypes_to_builddir - INSTALLS += build_integration -} else { - COPIES += build_integration -} - -load(qt_tool) diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro deleted file mode 100644 index 82b61ab12e..0000000000 --- a/src/qmlworkerscript/qmlworkerscript.pro +++ /dev/null @@ -1,26 +0,0 @@ -TARGET = QtQmlWorkerScript -QT = core-private qml-private - -QMAKE_DOCS = $$PWD/doc/qtqmlworkerscript.qdocconf - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FOREACH - -HEADERS += \ - qquickworkerscript_p.h \ - qtqmlworkerscriptglobal.h \ - qtqmlworkerscriptglobal_p.h \ - qv4serialize_p.h - -SOURCES += \ - qquickworkerscript.cpp \ - qv4serialize.cpp - -include(../3rdparty/masm/masm-defs.pri) - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript -QML_IMPORT_NAME = QtQml.WorkerScript -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes - -load(qt_module) diff --git a/src/quick/accessible/accessible.pri b/src/quick/accessible/accessible.pri deleted file mode 100644 index bff1325bd9..0000000000 --- a/src/quick/accessible/accessible.pri +++ /dev/null @@ -1,14 +0,0 @@ - -QT += core-private gui-private qml-private - -#DEFINES+=Q_ACCESSIBLE_QUICK_ITEM_ENABLE_DEBUG_DESCRIPTION - -SOURCES += \ - $$PWD/qaccessiblequickview.cpp \ - $$PWD/qaccessiblequickitem.cpp \ - $$PWD/qquickaccessiblefactory.cpp \ - -HEADERS += \ - $$PWD/qaccessiblequickview_p.h \ - $$PWD/qaccessiblequickitem_p.h \ - $$PWD/qquickaccessiblefactory_p.h \ diff --git a/src/quick/designer/designer.pri b/src/quick/designer/designer.pri deleted file mode 100644 index f87ea4da04..0000000000 --- a/src/quick/designer/designer.pri +++ /dev/null @@ -1,23 +0,0 @@ -HEADERS += \ - designer/qquickdesignercustomobjectdata_p.h \ - designer/qquickdesignersupportitems_p.h \ - designer/qquickdesignerwindowmanager_p.h \ - designer/qquickdesignersupportstates_p.h \ - designer/qquickdesignersupportpropertychanges_p.h \ - designer/qquickdesignersupportproperties_p.h \ - designer/qquickdesignersupportmetainfo_p.h \ - designer/qqmldesignermetaobject_p.h \ - designer/qquickdesignersupport_p.h \ - designer/qquickdesignercustomparserobject_p.h - -SOURCES += \ - designer/qquickdesignercustomobjectdata.cpp \ - designer/qquickdesignersupport.cpp \ - designer/qquickdesignersupportitems.cpp \ - designer/qquickdesignersupportmetainfo.cpp \ - designer/qquickdesignersupportproperties.cpp \ - designer/qquickdesignersupportpropertychanges.cpp \ - designer/qquickdesignersupportstates.cpp \ - designer/qquickdesignerwindowmanager.cpp \ - designer/qqmldesignermetaobject.cpp \ - designer/qquickdesignercustomparserobject.cpp diff --git a/src/quick/doc/snippets/code/doc_src_qtquick.pro b/src/quick/doc/snippets/code/doc_src_qtquick.pro deleted file mode 100644 index bdd4cd9a9c..0000000000 --- a/src/quick/doc/snippets/code/doc_src_qtquick.pro +++ /dev/null @@ -1,3 +0,0 @@ -#! [0] -QT += quick -#! [0] diff --git a/src/quick/doc/snippets/qml/tableview/tableview.pro b/src/quick/doc/snippets/qml/tableview/tableview.pro deleted file mode 100644 index 0821f1b5d3..0000000000 --- a/src/quick/doc/snippets/qml/tableview/tableview.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = app - -QT += qml quick - -CONFIG += qmltypes -QML_IMPORT_NAME = TableModel -QML_IMPORT_MAJOR_VERSION = 0 - -SOURCES += \ - cpp-tablemodel.cpp - -HEADERS += \ - cpp-tablemodel.h - -RESOURCES += \ - cpp-tablemodel.qml \ - qml-tablemodel.qml \ - reusabledelegate.qml \ - tableviewwithheader.qml \ - tableviewwithprovider.qml diff --git a/src/quick/handlers/handlers.pri b/src/quick/handlers/handlers.pri deleted file mode 100644 index 49975bd1ca..0000000000 --- a/src/quick/handlers/handlers.pri +++ /dev/null @@ -1,35 +0,0 @@ -HEADERS += \ - $$PWD/qquickdraghandler_p.h \ - $$PWD/qquickhandlerpoint_p.h \ - $$PWD/qquickhoverhandler_p.h \ - $$PWD/qquickmultipointhandler_p.h \ - $$PWD/qquickmultipointhandler_p_p.h \ - $$PWD/qquickpinchhandler_p.h \ - $$PWD/qquickpointerdevicehandler_p.h \ - $$PWD/qquickpointerdevicehandler_p_p.h \ - $$PWD/qquickpointerhandler_p.h \ - $$PWD/qquickpointerhandler_p_p.h \ - $$PWD/qquickpointhandler_p.h \ - $$PWD/qquicksinglepointhandler_p.h \ - $$PWD/qquicksinglepointhandler_p_p.h \ - $$PWD/qquicktaphandler_p.h \ - $$PWD/qquickdragaxis_p.h - -SOURCES += \ - $$PWD/qquickdraghandler.cpp \ - $$PWD/qquickhandlerpoint.cpp \ - $$PWD/qquickhoverhandler.cpp \ - $$PWD/qquickmultipointhandler.cpp \ - $$PWD/qquickpinchhandler.cpp \ - $$PWD/qquickpointerdevicehandler.cpp \ - $$PWD/qquickpointerhandler.cpp \ - $$PWD/qquickpointhandler.cpp \ - $$PWD/qquicksinglepointhandler.cpp \ - $$PWD/qquicktaphandler.cpp \ - $$PWD/qquickdragaxis.cpp - -qtConfig(wheelevent) { - HEADERS += $$PWD/qquickwheelhandler_p.h $$PWD/qquickwheelhandler_p_p.h - SOURCES += $$PWD/qquickwheelhandler.cpp -} - diff --git a/src/quick/items/context2d/context2d.pri b/src/quick/items/context2d/context2d.pri deleted file mode 100644 index c73d58b020..0000000000 --- a/src/quick/items/context2d/context2d.pri +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES += \ - $$PWD/qquickcanvasitem.cpp \ - $$PWD/qquickcanvascontext.cpp \ - $$PWD/qquickcontext2d.cpp \ - $$PWD/qquickcontext2dtile.cpp \ - $$PWD/qquickcontext2dtexture.cpp \ - $$PWD/qquickcontext2dcommandbuffer.cpp \ - -HEADERS += \ - $$PWD/qquickcanvasitem_p.h \ - $$PWD/qquickcanvascontext_p.h \ - $$PWD/qquickcontext2d_p.h \ - $$PWD/qquickcontext2dtile_p.h \ - $$PWD/qquickcontext2dtexture_p.h \ - $$PWD/qquickcontext2dcommandbuffer_p.h \ - diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri deleted file mode 100644 index 6e3fbca2b6..0000000000 --- a/src/quick/items/items.pri +++ /dev/null @@ -1,248 +0,0 @@ -HEADERS += \ - $$PWD/qquickabstractpaletteprovider_p.h \ - $$PWD/qquickevents_p_p.h \ - $$PWD/qquickanchors_p.h \ - $$PWD/qquickanchors_p_p.h \ - $$PWD/qquickaccessibleattached_p.h \ - $$PWD/qquickitem.h \ - $$PWD/qquickitem_p.h \ - $$PWD/qquickitemchangelistener_p.h \ - $$PWD/qquickrectangle_p.h \ - $$PWD/qquickrectangle_p_p.h \ - $$PWD/qquickwindow.h \ - $$PWD/qquickwindow_p.h \ - $$PWD/qquickfocusscope_p.h \ - $$PWD/qquickitemsmodule_p.h \ - $$PWD/qquickpainteditem.h \ - $$PWD/qquickpainteditem_p.h \ - $$PWD/qquicktext_p.h \ - $$PWD/qquicktext_p_p.h \ - $$PWD/qquicktextnode_p.h \ - $$PWD/qquicktextnodeengine_p.h \ - $$PWD/qquicktextinput_p.h \ - $$PWD/qquicktextinput_p_p.h \ - $$PWD/qquicktextcontrol_p.h \ - $$PWD/qquicktextcontrol_p_p.h \ - $$PWD/qquicktextdocument.h \ - $$PWD/qquicktextdocument_p.h \ - $$PWD/qquicktextedit_p.h \ - $$PWD/qquicktextedit_p_p.h \ - $$PWD/qquicktextutil_p.h \ - $$PWD/qquickimagebase_p.h \ - $$PWD/qquickimagebase_p_p.h \ - $$PWD/qquickimage_p.h \ - $$PWD/qquickimage_p_p.h \ - $$PWD/qquickborderimage_p.h \ - $$PWD/qquickborderimage_p_p.h \ - $$PWD/qquickscalegrid_p_p.h \ - $$PWD/qquickmousearea_p.h \ - $$PWD/qquickmousearea_p_p.h \ - $$PWD/qquickpincharea_p.h \ - $$PWD/qquickpincharea_p_p.h \ - $$PWD/qquickflickable_p.h \ - $$PWD/qquickflickable_p_p.h \ - $$PWD/qquickflickablebehavior_p.h \ - $$PWD/qquickloader_p.h \ - $$PWD/qquickloader_p_p.h \ - $$PWD/qquicktranslate_p.h \ - $$PWD/qquickclipnode_p.h \ - $$PWD/qquickview.h \ - $$PWD/qquickview_p.h \ - $$PWD/qquickitemanimation_p.h \ - $$PWD/qquickitemanimation_p_p.h \ - $$PWD/qquickstateoperations_p.h \ - $$PWD/qquickimplicitsizeitem_p.h \ - $$PWD/qquickimplicitsizeitem_p_p.h \ - $$PWD/qquickmultipointtoucharea_p.h \ - $$PWD/qquickscreen_p.h \ - $$PWD/qquickwindowattached_p.h \ - $$PWD/qquickwindowmodule_p.h \ - $$PWD/qquickwindowmodule_p_p.h \ - $$PWD/qquickrendercontrol.h \ - $$PWD/qquickrendercontrol_p.h \ - $$PWD/qquickgraphicsinfo_p.h \ - $$PWD/qquickitemgrabresult.h \ - $$PWD/qquickpalette_p.h \ - $$PWD/qquickcolorgroup_p.h \ - $$PWD/qquickpalettecolorprovider_p.h \ - $$PWD/qquickpaletteproviderprivatebase_p.h \ - $$PWD/qquickrendertarget.h \ - $$PWD/qquickrendertarget_p.h \ - $$PWD/qquickgraphicsdevice.h \ - $$PWD/qquickgraphicsdevice_p.h \ - $$PWD/qquickgraphicsconfiguration.h \ - $$PWD/qquickgraphicsconfiguration_p.h - -SOURCES += \ - $$PWD/qquickevents.cpp \ - $$PWD/qquickanchors.cpp \ - $$PWD/qquickitem.cpp \ - $$PWD/qquickrectangle.cpp \ - $$PWD/qquickwindow.cpp \ - $$PWD/qquickfocusscope.cpp \ - $$PWD/qquickitemsmodule.cpp \ - $$PWD/qquickpainteditem.cpp \ - $$PWD/qquicktext.cpp \ - $$PWD/qquicktextnode.cpp \ - $$PWD/qquicktextnodeengine.cpp \ - $$PWD/qquicktextinput.cpp \ - $$PWD/qquicktextcontrol.cpp \ - $$PWD/qquicktextdocument.cpp \ - $$PWD/qquicktextedit.cpp \ - $$PWD/qquicktextutil.cpp \ - $$PWD/qquickimagebase.cpp \ - $$PWD/qquickimage.cpp \ - $$PWD/qquickborderimage.cpp \ - $$PWD/qquickscalegrid.cpp \ - $$PWD/qquickmousearea.cpp \ - $$PWD/qquickpincharea.cpp \ - $$PWD/qquickflickable.cpp \ - $$PWD/qquickloader.cpp \ - $$PWD/qquicktranslate.cpp \ - $$PWD/qquickclipnode.cpp \ - $$PWD/qquickview.cpp \ - $$PWD/qquickitemanimation.cpp \ - $$PWD/qquickstateoperations.cpp \ - $$PWD/qquickimplicitsizeitem.cpp \ - $$PWD/qquickaccessibleattached.cpp \ - $$PWD/qquickmultipointtoucharea.cpp \ - $$PWD/qquickwindowmodule.cpp \ - $$PWD/qquickscreen.cpp \ - $$PWD/qquickwindowattached.cpp \ - $$PWD/qquickrendercontrol.cpp \ - $$PWD/qquickgraphicsinfo.cpp \ - $$PWD/qquickitemgrabresult.cpp \ - $$PWD/qquickpalettecolorprovider.cpp \ - $$PWD/qquickcolorgroup.cpp \ - $$PWD/qquickpalette.cpp \ - $$PWD/qquickrendertarget.cpp \ - $$PWD/qquickgraphicsdevice.cpp \ - $$PWD/qquickgraphicsconfiguration.cpp - -qtConfig(quick-draganddrop) { - HEADERS += \ - $$PWD/qquickdrag_p.h \ - $$PWD/qquickdroparea_p.h \ - - SOURCES += \ - $$PWD/qquickdrag.cpp \ - $$PWD/qquickdroparea.cpp \ -} - -qtConfig(quick-animatedimage) { - HEADERS += \ - $$PWD/qquickanimatedimage_p.h \ - $$PWD/qquickanimatedimage_p_p.h - SOURCES += \ - $$PWD/qquickanimatedimage.cpp -} - -qtConfig(quick-gridview) { - HEADERS += \ - $$PWD/qquickgridview_p.h - SOURCES += \ - $$PWD/qquickgridview.cpp -} - -qtConfig(quick-itemview) { - HEADERS += \ - $$PWD/qquickitemviewfxitem_p_p.h \ - $$PWD/qquickitemview_p.h \ - $$PWD/qquickitemview_p_p.h - SOURCES += \ - $$PWD/qquickitemviewfxitem.cpp \ - $$PWD/qquickitemview.cpp -} - -qtConfig(quick-viewtransitions) { - HEADERS += \ - $$PWD/qquickitemviewtransition_p.h - SOURCES += \ - $$PWD/qquickitemviewtransition.cpp -} - -qtConfig(quick-listview) { - HEADERS += \ - $$PWD/qquicklistview_p.h - SOURCES += \ - $$PWD/qquicklistview.cpp -} - -qtConfig(quick-tableview) { - HEADERS += \ - $$PWD/qquicktableview_p.h \ - $$PWD/qquicktableview_p_p.h - SOURCES += \ - $$PWD/qquicktableview.cpp -} - -qtConfig(quick-pathview) { - HEADERS += \ - $$PWD/qquickpathview_p.h \ - $$PWD/qquickpathview_p_p.h - SOURCES += \ - $$PWD/qquickpathview.cpp -} - -qtConfig(quick-positioners) { - HEADERS += \ - $$PWD/qquickpositioners_p.h \ - $$PWD/qquickpositioners_p_p.h - SOURCES += \ - $$PWD/qquickpositioners.cpp -} - -qtConfig(quick-flipable) { - HEADERS += \ - $$PWD/qquickflipable_p.h - SOURCES += \ - $$PWD/qquickflipable.cpp -} - -qtConfig(quick-repeater) { - HEADERS += \ - $$PWD/qquickrepeater_p.h \ - $$PWD/qquickrepeater_p_p.h - - SOURCES += \ - $$PWD/qquickrepeater.cpp -} - -qtConfig(quick-shadereffect) { - HEADERS += \ - $$PWD/qquickshadereffectsource_p.h \ - $$PWD/qquickshadereffectmesh_p.h \ - $$PWD/qquickshadereffect_p.h - SOURCES += \ - $$PWD/qquickshadereffectsource.cpp \ - $$PWD/qquickshadereffectmesh.cpp \ - $$PWD/qquickshadereffect.cpp -} - -qtConfig(quick-sprite) { - HEADERS += \ - $$PWD/qquickspriteengine_p.h \ - $$PWD/qquicksprite_p.h \ - $$PWD/qquickspritesequence_p.h \ - $$PWD/qquickanimatedsprite_p.h \ - $$PWD/qquickanimatedsprite_p_p.h \ - $$PWD/qquickspritesequence_p_p.h - SOURCES += \ - $$PWD/qquickspriteengine.cpp \ - $$PWD/qquicksprite.cpp \ - $$PWD/qquickspritesequence.cpp \ - $$PWD/qquickanimatedsprite.cpp -} - -# Items that depend on OpenGL Renderer -qtConfig(opengl(es1|es2)?) { - SOURCES += \ - $$PWD/qquickframebufferobject.cpp - - HEADERS += \ - $$PWD/qquickframebufferobject.h -} - - -qtConfig(quick-canvas): \ - include(context2d/context2d.pri) diff --git a/src/quick/quick.pro b/src/quick/quick.pro deleted file mode 100644 index 1e2c0360c2..0000000000 --- a/src/quick/quick.pro +++ /dev/null @@ -1,64 +0,0 @@ -TARGET = QtQuick - -QT = core-private gui-private qml-private qmlmodels-private -qtConfig(qml-network): \ - QT_PRIVATE += network - -### To support compatibility API that is only available when using RHI/OpenGL -qtConfig(opengl) { - QT_PRIVATE += opengl-private - QT += opengl -} - -TRACEPOINT_PROVIDER = $$PWD/qtquick.tracepoints -CONFIG += qt_tracepoints - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES -msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS -solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -win32: LIBS += -luser32 - -DEFINES += QT_NO_FOREACH - -exists("qqml_enable_gcov") { - QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors - LIBS_PRIVATE += -lgcov -} - -QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf - -MODULE_PLUGIN_TYPES += \ - scenegraph -ANDROID_BUNDLED_FILES += \ - qml - -include(util/util.pri) -include(scenegraph/scenegraph.pri) -include(items/items.pri) -include(handlers/handlers.pri) -qtConfig(quick-designer): \ - include(designer/designer.pri) -qtConfig(accessibility) { - include(accessible/accessible.pri) -} - -HEADERS += \ - qtquickglobal.h \ - qtquickglobal_p.h - -# To make #include "qquickcontext2d_jsclass.cpp" work -INCLUDEPATH += $$PWD - -load(qt_module) - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick -QML_IMPORT_NAME = QtQuick -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes - -# Install QtQuick.Window qmldir -qmldir.files = $$PWD/../imports/window/qmldir -qmldir.path = $$[QT_INSTALL_QML]/QtQuick/Window -prefix_build: INSTALLS += qmldir -else: COPIES += qmldir diff --git a/src/quick/scenegraph/adaptations/adaptations.pri b/src/quick/scenegraph/adaptations/adaptations.pri deleted file mode 100644 index 40fa739e15..0000000000 --- a/src/quick/scenegraph/adaptations/adaptations.pri +++ /dev/null @@ -1 +0,0 @@ -include(software/software.pri) diff --git a/src/quick/scenegraph/adaptations/software/software.pri b/src/quick/scenegraph/adaptations/software/software.pri deleted file mode 100644 index 278dbe7944..0000000000 --- a/src/quick/scenegraph/adaptations/software/software.pri +++ /dev/null @@ -1,53 +0,0 @@ -QT += gui-private core-private qml-private - -#DEFINES += QTQUICK2D_DEBUG_FLUSH - -SOURCES += \ - $$PWD/qsgsoftwarecontext.cpp \ - $$PWD/qsgabstractsoftwarerenderer.cpp \ - $$PWD/qsgsoftwareglyphnode.cpp \ - $$PWD/qsgsoftwareinternalimagenode.cpp \ - $$PWD/qsgsoftwarepublicnodes.cpp \ - $$PWD/qsgsoftwarepainternode.cpp \ - $$PWD/qsgsoftwareinternalrectanglenode.cpp \ - $$PWD/qsgsoftwarepixmaprenderer.cpp \ - $$PWD/qsgsoftwarepixmaptexture.cpp \ - $$PWD/qsgsoftwarerenderablenode.cpp \ - $$PWD/qsgsoftwarerenderablenodeupdater.cpp \ - $$PWD/qsgsoftwarerenderer.cpp \ - $$PWD/qsgsoftwarerenderlistbuilder.cpp \ - $$PWD/qsgsoftwarerenderloop.cpp \ - $$PWD/qsgsoftwarelayer.cpp \ - $$PWD/qsgsoftwareadaptation.cpp - -HEADERS += \ - $$PWD/qsgsoftwarecontext_p.h \ - $$PWD/qsgabstractsoftwarerenderer_p.h \ - $$PWD/qsgsoftwareglyphnode_p.h \ - $$PWD/qsgsoftwareinternalimagenode_p.h \ - $$PWD/qsgsoftwarepublicnodes_p.h \ - $$PWD/qsgsoftwarepainternode_p.h \ - $$PWD/qsgsoftwarepixmaprenderer_p.h \ - $$PWD/qsgsoftwarepixmaptexture_p.h \ - $$PWD/qsgsoftwareinternalrectanglenode_p.h \ - $$PWD/qsgsoftwarerenderablenode_p.h \ - $$PWD/qsgsoftwarerenderablenodeupdater_p.h \ - $$PWD/qsgsoftwarerenderer_p.h \ - $$PWD/qsgsoftwarerenderlistbuilder_p.h \ - $$PWD/qsgsoftwarerenderloop_p.h \ - $$PWD/qsgsoftwarelayer_p.h \ - $$PWD/qsgsoftwareadaptation_p.h - -qtConfig(quick-sprite) { - SOURCES += \ - $$PWD/qsgsoftwarespritenode.cpp - HEADERS += \ - $$PWD/qsgsoftwarespritenode_p.h -} - -qtConfig(thread) { - SOURCES += \ - $$PWD/qsgsoftwarethreadedrenderloop.cpp - HEADERS +=\ - $$PWD/qsgsoftwarethreadedrenderloop_p.h -} diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri deleted file mode 100644 index c1c489abe8..0000000000 --- a/src/quick/scenegraph/scenegraph.pri +++ /dev/null @@ -1,170 +0,0 @@ -# DEFINES += QSG_DISTANCEFIELD_CACHE_DEBUG - -# Core API -HEADERS += \ - $$PWD/coreapi/qsggeometry.h \ - $$PWD/coreapi/qsgmaterial.h \ - $$PWD/coreapi/qsgmaterialtype.h \ - $$PWD/coreapi/qsgmaterialshader.h \ - $$PWD/coreapi/qsgmaterialshader_p.h \ - $$PWD/coreapi/qsgnode.h \ - $$PWD/coreapi/qsgnode_p.h \ - $$PWD/coreapi/qsgnodeupdater_p.h \ - $$PWD/coreapi/qsgabstractrenderer_p.h \ - $$PWD/coreapi/qsgabstractrenderer_p_p.h \ - $$PWD/coreapi/qsgrenderer_p.h \ - $$PWD/coreapi/qsgrendernode.h \ - $$PWD/coreapi/qsgrendernode_p.h \ - $$PWD/coreapi/qsgrendererinterface.h \ - $$PWD/coreapi/qsggeometry_p.h \ - $$PWD/coreapi/qsgtexture.h \ - $$PWD/coreapi/qsgtexture_p.h \ - $$PWD/coreapi/qsgtexture_platform.h \ - $$PWD/coreapi/qsgbatchrenderer_p.h \ - $$PWD/coreapi/qsgrhivisualizer_p.h - -SOURCES += \ - $$PWD/coreapi/qsgabstractrenderer.cpp \ - $$PWD/coreapi/qsggeometry.cpp \ - $$PWD/coreapi/qsgmaterial.cpp \ - $$PWD/coreapi/qsgmaterialshader.cpp \ - $$PWD/coreapi/qsgtexture.cpp \ - $$PWD/coreapi/qsgnode.cpp \ - $$PWD/coreapi/qsgnodeupdater.cpp \ - $$PWD/coreapi/qsgrenderer.cpp \ - $$PWD/coreapi/qsgrendernode.cpp \ - $$PWD/coreapi/qsgrendererinterface.cpp \ - $$PWD/coreapi/qsgbatchrenderer.cpp \ - $$PWD/coreapi/qsgrhivisualizer.cpp - -macos|ios { - SOURCES += \ - $$PWD/coreapi/qsgtexture_mac.mm -} - -# Util API -HEADERS += \ - $$PWD/util/qsgareaallocator_p.h \ - $$PWD/util/qsgplaintexture_p.h \ - $$PWD/util/qsgsimplerectnode.h \ - $$PWD/util/qsgsimpletexturenode.h \ - $$PWD/util/qsgtextureprovider.h \ - $$PWD/util/qsgflatcolormaterial.h \ - $$PWD/util/qsgtexturematerial.h \ - $$PWD/util/qsgtexturematerial_p.h \ - $$PWD/util/qsgvertexcolormaterial.h \ - $$PWD/util/qsgrectanglenode.h \ - $$PWD/util/qsgimagenode.h \ - $$PWD/util/qsgninepatchnode.h - -SOURCES += \ - $$PWD/util/qsgareaallocator.cpp \ - $$PWD/util/qsgplaintexture.cpp \ - $$PWD/util/qsgsimplerectnode.cpp \ - $$PWD/util/qsgsimpletexturenode.cpp \ - $$PWD/util/qsgtextureprovider.cpp \ - $$PWD/util/qsgflatcolormaterial.cpp \ - $$PWD/util/qsgtexturematerial.cpp \ - $$PWD/util/qsgvertexcolormaterial.cpp \ - $$PWD/util/qsgrectanglenode.cpp \ - $$PWD/util/qsgimagenode.cpp \ - $$PWD/util/qsgninepatchnode.cpp - -# RHI -HEADERS += \ - $$PWD/qsgrhitextureglyphcache_p.h \ - $$PWD/util/qsgrhiatlastexture_p.h \ - $$PWD/qsgrhilayer_p.h \ - $$PWD/qsgrhishadereffectnode_p.h \ - $$PWD/qsgrhidistancefieldglyphcache_p.h - -SOURCES += \ - $$PWD/qsgrhitextureglyphcache.cpp \ - $$PWD/qsgrhilayer.cpp \ - $$PWD/qsgrhishadereffectnode.cpp \ - $$PWD/util/qsgrhiatlastexture.cpp \ - $$PWD/qsgrhidistancefieldglyphcache.cpp - -# QML / Adaptations API -HEADERS += \ - $$PWD/qsgadaptationlayer_p.h \ - $$PWD/qsgcontext_p.h \ - $$PWD/qsgcontextplugin_p.h \ - $$PWD/qsgbasicinternalrectanglenode_p.h \ - $$PWD/qsgbasicinternalimagenode_p.h \ - $$PWD/qsgbasicglyphnode_p.h \ - $$PWD/qsgrenderloop_p.h \ - $$PWD/qsgrhisupport_p.h - -SOURCES += \ - $$PWD/qsgadaptationlayer.cpp \ - $$PWD/qsgcontext.cpp \ - $$PWD/qsgcontextplugin.cpp \ - $$PWD/qsgbasicinternalrectanglenode.cpp \ - $$PWD/qsgbasicinternalimagenode.cpp \ - $$PWD/qsgbasicglyphnode.cpp \ - $$PWD/qsgrenderloop.cpp \ - $$PWD/qsgrhisupport.cpp - -SOURCES += \ - $$PWD/qsgdefaultglyphnode.cpp \ - $$PWD/qsgdefaultglyphnode_p.cpp \ - $$PWD/qsgdistancefieldglyphnode.cpp \ - $$PWD/qsgdistancefieldglyphnode_p.cpp \ - $$PWD/qsgdefaultinternalimagenode.cpp \ - $$PWD/qsgdefaultinternalrectanglenode.cpp \ - $$PWD/qsgdefaultrendercontext.cpp \ - $$PWD/qsgdefaultcontext.cpp \ - $$PWD/util/qsgdefaultpainternode.cpp \ - $$PWD/util/qsgdefaultrectanglenode.cpp \ - $$PWD/util/qsgdefaultimagenode.cpp \ - $$PWD/util/qsgdefaultninepatchnode.cpp -HEADERS += \ - $$PWD/qsgdefaultglyphnode_p.h \ - $$PWD/qsgdistancefieldglyphnode_p.h \ - $$PWD/qsgdistancefieldglyphnode_p_p.h \ - $$PWD/qsgdefaultglyphnode_p_p.h \ - $$PWD/qsgdefaultinternalimagenode_p.h \ - $$PWD/qsgdefaultinternalrectanglenode_p.h \ - $$PWD/qsgdefaultrendercontext_p.h \ - $$PWD/qsgdefaultcontext_p.h \ - $$PWD/util/qsgdefaultpainternode_p.h \ - $$PWD/util/qsgdefaultrectanglenode_p.h \ - $$PWD/util/qsgdefaultimagenode_p.h \ - $$PWD/util/qsgdefaultninepatchnode_p.h - -qtConfig(thread) { - SOURCES += \ - $$PWD/qsgthreadedrenderloop.cpp - HEADERS += \ - $$PWD/qsgthreadedrenderloop_p.h -} - -qtConfig(quick-sprite) { - SOURCES += \ - $$PWD/qsgdefaultspritenode.cpp - HEADERS += \ - $$PWD/qsgdefaultspritenode_p.h -} - -# Built-in, non-plugin-based adaptations -include(adaptations/adaptations.pri) - -RESOURCES += \ - $$PWD/scenegraph.qrc - -# Compressed Texture API -HEADERS += \ - $$PWD/util/qsgtexturereader_p.h - -SOURCES += \ - $$PWD/util/qsgtexturereader.cpp - - HEADERS += \ - $$PWD/compressedtexture/qsgcompressedatlastexture_p.h \ - $$PWD/compressedtexture/qsgcompressedtexture_p.h - - SOURCES += \ - $$PWD/compressedtexture/qsgcompressedatlastexture.cpp \ - $$PWD/compressedtexture/qsgcompressedtexture.cpp - diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri deleted file mode 100644 index 56e7d342f8..0000000000 --- a/src/quick/util/util.pri +++ /dev/null @@ -1,90 +0,0 @@ -SOURCES += \ - $$PWD/qquickapplication.cpp\ - $$PWD/qquickanimation.cpp \ - $$PWD/qquicksystempalette.cpp \ - $$PWD/qquickspringanimation.cpp \ - $$PWD/qquicksmoothedanimation.cpp \ - $$PWD/qquickanimationcontroller.cpp \ - $$PWD/qquickstate.cpp\ - $$PWD/qquicktransitionmanager.cpp \ - $$PWD/qquickstatechangescript.cpp \ - $$PWD/qquickpropertychanges.cpp \ - $$PWD/qquickstategroup.cpp \ - $$PWD/qquicktransition.cpp \ - $$PWD/qquicktimeline.cpp \ - $$PWD/qquickpixmapcache.cpp \ - $$PWD/qquickbehavior.cpp \ - $$PWD/qquickfontloader.cpp \ - $$PWD/qquickstyledtext.cpp \ - $$PWD/qquickimageprovider.cpp \ - $$PWD/qquicksvgparser.cpp \ - $$PWD/qquickvaluetypes.cpp \ - $$PWD/qquickglobal.cpp \ - $$PWD/qquickanimator.cpp \ - $$PWD/qquickanimatorjob.cpp \ - $$PWD/qquickanimatorcontroller.cpp \ - $$PWD/qquickfontmetrics.cpp \ - $$PWD/qquicktextmetrics.cpp \ - $$PWD/qquickvalidator.cpp - -qtConfig(qml-debug): SOURCES += $$PWD/qquickprofiler.cpp - -HEADERS += \ - $$PWD/qquickapplication_p.h\ - $$PWD/qquickanimation_p.h \ - $$PWD/qquickanimation_p_p.h \ - $$PWD/qquicksystempalette_p.h \ - $$PWD/qquickspringanimation_p.h \ - $$PWD/qquickanimationcontroller_p.h \ - $$PWD/qquicksmoothedanimation_p.h \ - $$PWD/qquicksmoothedanimation_p_p.h \ - $$PWD/qquickstate_p.h\ - $$PWD/qquickstatechangescript_p.h \ - $$PWD/qquickpropertychanges_p.h \ - $$PWD/qquickstate_p_p.h\ - $$PWD/qquicktransitionmanager_p_p.h \ - $$PWD/qquickstategroup_p.h \ - $$PWD/qquicktransition_p.h \ - $$PWD/qquicktimeline_p_p.h \ - $$PWD/qquickpixmapcache_p.h \ - $$PWD/qquickbehavior_p.h \ - $$PWD/qquickfontloader_p.h \ - $$PWD/qquickstyledtext_p.h \ - $$PWD/qquickimageprovider.h \ - $$PWD/qquickimageprovider_p.h \ - $$PWD/qquicksvgparser_p.h \ - $$PWD/qquickvaluetypes_p.h \ - $$PWD/qquickanimator_p.h \ - $$PWD/qquickanimator_p_p.h \ - $$PWD/qquickanimatorjob_p.h \ - $$PWD/qquickanimatorcontroller_p.h \ - $$PWD/qquickprofiler_p.h \ - $$PWD/qquickfontmetrics_p.h \ - $$PWD/qquicktextmetrics_p.h \ - $$PWD/qquickvalidator_p.h \ - $$PWD/qquickforeignutils_p.h - -qtConfig(shortcut) { - SOURCES += \ - $$PWD/qquickshortcut.cpp - HEADERS += \ - $$PWD/qquickshortcut_p.h -} - -qtConfig(quick-path) { - SOURCES += \ - $$PWD/qquickpath.cpp \ - $$PWD/qquickpathinterpolator.cpp - HEADERS += \ - $$PWD/qquickpath_p.h \ - $$PWD/qquickpath_p_p.h \ - $$PWD/qquickpathinterpolator_p.h -} - -qtConfig(opengl(es1|es2)?) { - SOURCES += \ - $$PWD/qquickopenglutils.cpp - - HEADERS += \ - $$PWD/qquickopenglutils.h -} diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro deleted file mode 100644 index c53d267df6..0000000000 --- a/src/quickshapes/quickshapes.pro +++ /dev/null @@ -1,28 +0,0 @@ -TARGET = QtQuickShapes - -QT = core gui-private qml quick-private - -CONFIG += simd optimize_full internal_module - -HEADERS += \ - qquickshapesglobal.h \ - qquickshapesglobal_p.h \ - qquickshape_p.h \ - qquickshape_p_p.h \ - qquickshapegenericrenderer_p.h \ - qquickshapesoftwarerenderer_p.h - -SOURCES += \ - qquickshape.cpp \ - qquickshapegenericrenderer.cpp \ - qquickshapesoftwarerenderer.cpp - -RESOURCES += qtquickshapes.qrc - -load(qt_module) - -QMLTYPES_FILENAME = plugins.qmltypes -QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Shapes -QML_IMPORT_NAME = QtQuick.Shapes -QML_IMPORT_VERSION = $$QT_VERSION -CONFIG += qmltypes install_qmltypes install_metatypes diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro deleted file mode 100644 index bbf945d05d..0000000000 --- a/src/quickwidgets/quickwidgets.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = QtQuickWidgets - -QT = core-private gui-private qml-private quick-private widgets-private - -qtConfig(opengl): QT_PRIVATE += opengl-private - -DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES QT_NO_FOREACH - -HEADERS += \ - qquickwidget.h \ - qquickwidget_p.h \ - qtquickwidgetsglobal.h - -SOURCES += \ - qquickwidget.cpp - -load(qt_module) diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index bd62073bd2..0000000000 --- a/src/src.pro +++ /dev/null @@ -1,58 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered -include($$OUT_PWD/qml/qtqml-config.pri) -include($$OUT_PWD/quick/qtquick-config.pri) -QT_FOR_CONFIG += qml qml-private quick-private - -# We need qmltyperegistrar for all type registrations, even in qml -SUBDIRS += \ - qmltyperegistrar \ - qml \ - qmlmodels - -qtConfig(qml-worker-script): \ - SUBDIRS += qmlworkerscript - -qtHaveModule(gui):qtConfig(qml-animation) { - SUBDIRS += quick - - qtConfig(quick-path): \ - SUBDIRS += quickshapes - - qtConfig(testlib): \ - SUBDIRS += qmltest - - qtConfig(quick-particles): \ - SUBDIRS += particles - - qtHaveModule(widgets): SUBDIRS += quickwidgets - qtConfig(private_tests):qtConfig(testlib) { - src_qmltest_doc_snippets.subdir = qmltest/doc/snippets - src_qmltest_doc_snippets.target = sub-qmltest-doc-snippets - src_qmltest_doc_snippets.depends = src_qmltest - SUBDIRS += src_qmltest_doc_snippets - } -} - -SUBDIRS += \ - plugins \ - imports - -qtConfig(qml-devtools) { - SUBDIRS += \ - qmldevtools \ - qmldom \ - qmlcompiler - - qmldevtools.depends = qml - qmlcompiler.depends = qmldevtools - qmldom.depends = qmldevtools -} - - -qtConfig(qml-network) { - QT_FOR_CONFIG += network - qtConfig(thread):qtConfig(localserver):qtConfig(qml-debug): SUBDIRS += qmldebug -} - -DISTFILES += sync.profile configure.json |