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/qml | |
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/qml')
-rw-r--r-- | src/qml/animations/animations.pri | 18 | ||||
-rw-r--r-- | src/qml/common/common.pri | 40 | ||||
-rw-r--r-- | src/qml/compiler/compiler.pri | 29 | ||||
-rw-r--r-- | src/qml/configure.pri | 22 | ||||
-rw-r--r-- | src/qml/debugger/debugger.pri | 28 | ||||
-rw-r--r-- | src/qml/doc/snippets/code/backend/backend.pro | 17 | ||||
-rw-r--r-- | src/qml/doc/snippets/code/doc_src_qtqml.pro | 3 | ||||
-rw-r--r-- | src/qml/doc/snippets/qml/integrating-javascript/scarceresources/scarceresources.pro | 22 | ||||
-rw-r--r-- | src/qml/jit/jit.pri | 12 | ||||
-rw-r--r-- | src/qml/jsapi/jsapi.pri | 16 | ||||
-rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 179 | ||||
-rw-r--r-- | src/qml/memory/memory.pri | 11 | ||||
-rw-r--r-- | src/qml/parser/parser.pri | 23 | ||||
-rw-r--r-- | src/qml/qml.pro | 81 | ||||
-rw-r--r-- | src/qml/qml/ftw/ftw.pri | 26 | ||||
-rw-r--r-- | src/qml/qml/qml.pri | 193 | ||||
-rw-r--r-- | src/qml/qml/v8/v8.pri | 9 | ||||
-rw-r--r-- | src/qml/qmldirparser/qmldirparser.pri | 10 | ||||
-rw-r--r-- | src/qml/types/types.pri | 22 | ||||
-rw-r--r-- | src/qml/util/util.pri | 5 |
20 files changed, 0 insertions, 766 deletions
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 |