diff options
24 files changed, 56 insertions, 56 deletions
diff --git a/src/qmlcompiler/qcoloroutput_p.h b/src/qmlcompiler/qcoloroutput_p.h index c53b666802..af80e13f7e 100644 --- a/src/qmlcompiler/qcoloroutput_p.h +++ b/src/qmlcompiler/qcoloroutput_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtCore/private/qglobal_p.h> #include <QtCore/qscopedpointer.h> @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE class QColorOutputPrivate; -class Q_QMLCOMPILER_PRIVATE_EXPORT QColorOutput +class Q_QMLCOMPILER_EXPORT QColorOutput { enum { diff --git a/src/qmlcompiler/qdeferredpointer_p.h b/src/qmlcompiler/qdeferredpointer_p.h index 623dd127ab..e4d5eb6df3 100644 --- a/src/qmlcompiler/qdeferredpointer_p.h +++ b/src/qmlcompiler/qdeferredpointer_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtCore/private/qglobal_p.h> #include <QtCore/qsharedpointer.h> diff --git a/src/qmlcompiler/qqmljsbasicblocks_p.h b/src/qmlcompiler/qqmljsbasicblocks_p.h index 0b0cc1d008..303070a2f2 100644 --- a/src/qmlcompiler/qqmljsbasicblocks_p.h +++ b/src/qmlcompiler/qqmljsbasicblocks_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSBasicBlocks : public QQmlJSCompilePass +class Q_QMLCOMPILER_EXPORT QQmlJSBasicBlocks : public QQmlJSCompilePass { public: struct BasicBlock { diff --git a/src/qmlcompiler/qqmljscodegenerator_p.h b/src/qmlcompiler/qqmljscodegenerator_p.h index 580019758a..f29b3dd474 100644 --- a/src/qmlcompiler/qqmljscodegenerator_p.h +++ b/src/qmlcompiler/qqmljscodegenerator_p.h @@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSCodeGenerator : public QQmlJSCompilePass +class Q_QMLCOMPILER_EXPORT QQmlJSCodeGenerator : public QQmlJSCompilePass { public: QQmlJSCodeGenerator(const QV4::Compiler::Context *compilerContext, @@ -49,7 +49,7 @@ protected: // This is an RAII helper we can use to automatically convert the result of "inflexible" // operations to the desired type. For example GetLookup can only retrieve the type of // the property we're looking up. If we want to store a different type, we need to convert. - struct Q_QMLCOMPILER_PRIVATE_EXPORT AccumulatorConverter + struct Q_QMLCOMPILER_EXPORT AccumulatorConverter { Q_DISABLE_COPY_MOVE(AccumulatorConverter); AccumulatorConverter(QQmlJSCodeGenerator *generator); diff --git a/src/qmlcompiler/qqmljscompiler_p.h b/src/qmlcompiler/qqmljscompiler_p.h index 94c2f6283c..aace476cf1 100644 --- a/src/qmlcompiler/qqmljscompiler_p.h +++ b/src/qmlcompiler/qqmljscompiler_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtCore/qstring.h> #include <QtCore/qlist.h> @@ -32,9 +32,9 @@ QT_BEGIN_NAMESPACE -Q_QMLCOMPILER_PRIVATE_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcAotCompiler); +Q_QMLCOMPILER_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcAotCompiler); -struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSCompileError +struct Q_QMLCOMPILER_EXPORT QQmlJSCompileError { QString message; void print(); @@ -45,7 +45,7 @@ struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSCompileError const QQmlJS::DiagnosticMessage &diagnostic); }; -struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSAotFunction +struct Q_QMLCOMPILER_EXPORT QQmlJSAotFunction { QStringList includes; QStringList argumentTypes; @@ -53,7 +53,7 @@ struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSAotFunction QString returnType; }; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSAotCompiler +class Q_QMLCOMPILER_EXPORT QQmlJSAotCompiler { public: enum Flag { @@ -109,25 +109,25 @@ using QQmlJSSaveFunction = std::function<bool(const QV4::CompiledData::SaveableUnitPointer &, const QQmlJSAotFunctionMap &, QString *)>; -bool Q_QMLCOMPILER_PRIVATE_EXPORT qCompileQmlFile(const QString &inputFileName, +bool Q_QMLCOMPILER_EXPORT qCompileQmlFile(const QString &inputFileName, QQmlJSSaveFunction saveFunction, QQmlJSAotCompiler *aotCompiler, QQmlJSCompileError *error, bool storeSourceLocation = false, QV4::Compiler::CodegenWarningInterface *interface = QV4::Compiler::defaultCodegenWarningInterface(), const QString *fileContents = nullptr); -bool Q_QMLCOMPILER_PRIVATE_EXPORT qCompileQmlFile(QmlIR::Document &irDocument, const QString &inputFileName, +bool Q_QMLCOMPILER_EXPORT qCompileQmlFile(QmlIR::Document &irDocument, const QString &inputFileName, QQmlJSSaveFunction saveFunction, QQmlJSAotCompiler *aotCompiler, QQmlJSCompileError *error, bool storeSourceLocation = false, QV4::Compiler::CodegenWarningInterface *interface = QV4::Compiler::defaultCodegenWarningInterface(), const QString *fileContents = nullptr); -bool Q_QMLCOMPILER_PRIVATE_EXPORT qCompileJSFile(const QString &inputFileName, const QString &inputFileUrl, +bool Q_QMLCOMPILER_EXPORT qCompileJSFile(const QString &inputFileName, const QString &inputFileUrl, QQmlJSSaveFunction saveFunction, QQmlJSCompileError *error); -bool Q_QMLCOMPILER_PRIVATE_EXPORT qSaveQmlJSUnitAsCpp(const QString &inputFileName, +bool Q_QMLCOMPILER_EXPORT qSaveQmlJSUnitAsCpp(const QString &inputFileName, const QString &outputFileName, const QV4::CompiledData::SaveableUnitPointer &unit, const QQmlJSAotFunctionMap &aotFunctions, diff --git a/src/qmlcompiler/qqmljsfunctioninitializer_p.h b/src/qmlcompiler/qqmljsfunctioninitializer_p.h index 9f191a4af8..424959a4fa 100644 --- a/src/qmlcompiler/qqmljsfunctioninitializer_p.h +++ b/src/qmlcompiler/qqmljsfunctioninitializer_p.h @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSFunctionInitializer +class Q_QMLCOMPILER_EXPORT QQmlJSFunctionInitializer { Q_DISABLE_COPY_MOVE(QQmlJSFunctionInitializer) public: diff --git a/src/qmlcompiler/qqmljsimporter_p.h b/src/qmlcompiler/qqmljsimporter_p.h index cbd0efc167..dd06f5289d 100644 --- a/src/qmlcompiler/qqmljsimporter_p.h +++ b/src/qmlcompiler/qqmljsimporter_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include "qqmljscontextualtypes_p.h" #include "qqmljsscope_p.h" @@ -63,7 +63,7 @@ private: class QQmlJSImportVisitor; class QQmlJSLogger; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSImporter +class Q_QMLCOMPILER_EXPORT QQmlJSImporter { public: using ImportedTypes = QQmlJS::ContextualTypes; diff --git a/src/qmlcompiler/qqmljsimportvisitor_p.h b/src/qmlcompiler/qqmljsimportvisitor_p.h index 96e38b8b72..532b252f71 100644 --- a/src/qmlcompiler/qqmljsimportvisitor_p.h +++ b/src/qmlcompiler/qqmljsimportvisitor_p.h @@ -15,7 +15,7 @@ // We mean it. #include <private/qqmljscontextualtypes_p.h> -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include "qqmljsannotation_p.h" #include "qqmljsimporter_p.h" @@ -39,7 +39,7 @@ class QQmlDomAstCreatorWithQQmlJSScope; } struct QQmlJSResourceFileMapper; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSImportVisitor : public QQmlJS::AST::Visitor +class Q_QMLCOMPILER_EXPORT QQmlJSImportVisitor : public QQmlJS::AST::Visitor { public: QQmlJSImportVisitor(); diff --git a/src/qmlcompiler/qqmljslinter_p.h b/src/qmlcompiler/qqmljslinter_p.h index 33c72c3b96..5f367df4c6 100644 --- a/src/qmlcompiler/qqmljslinter_p.h +++ b/src/qmlcompiler/qqmljslinter_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtQmlCompiler/private/qqmljslogger_p.h> #include <QtQmlCompiler/private/qqmljsimporter_p.h> @@ -38,7 +38,7 @@ namespace QQmlSA { class LintPlugin; } -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSLinter +class Q_QMLCOMPILER_EXPORT QQmlJSLinter { public: QQmlJSLinter(const QStringList &importPaths, @@ -48,7 +48,7 @@ public: enum LintResult { FailedToOpen, FailedToParse, HasWarnings, LintSuccess }; enum FixResult { NothingToFix, FixError, FixSuccess }; - class Q_QMLCOMPILER_PRIVATE_EXPORT Plugin + class Q_QMLCOMPILER_EXPORT Plugin { Q_DISABLE_COPY(Plugin) public: diff --git a/src/qmlcompiler/qqmljsliteralbindingcheck_p.h b/src/qmlcompiler/qqmljsliteralbindingcheck_p.h index 92acd0555c..8a06123923 100644 --- a/src/qmlcompiler/qqmljsliteralbindingcheck_p.h +++ b/src/qmlcompiler/qqmljsliteralbindingcheck_p.h @@ -15,14 +15,14 @@ // We mean it. #include <QtCore/qglobal.h> -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> QT_BEGIN_NAMESPACE class QQmlJSImportVisitor; class QQmlJSTypeResolver; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSLiteralBindingCheck +class Q_QMLCOMPILER_EXPORT QQmlJSLiteralBindingCheck { public: void run(QQmlJSImportVisitor *visitor, QQmlJSTypeResolver *resolver); diff --git a/src/qmlcompiler/qqmljsloadergenerator_p.h b/src/qmlcompiler/qqmljsloadergenerator_p.h index fc207f075b..f76fdef17b 100644 --- a/src/qmlcompiler/qqmljsloadergenerator_p.h +++ b/src/qmlcompiler/qqmljsloadergenerator_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtCore/qstring.h> #include <QtCore/qlist.h> @@ -22,11 +22,11 @@ QT_BEGIN_NAMESPACE -bool Q_QMLCOMPILER_PRIVATE_EXPORT qQmlJSGenerateLoader(const QStringList &compiledFiles, +bool Q_QMLCOMPILER_EXPORT qQmlJSGenerateLoader(const QStringList &compiledFiles, const QString &outputFileName, const QStringList &resourceFileMappings, QString *errorString); -QString Q_QMLCOMPILER_PRIVATE_EXPORT qQmlJSSymbolNamespaceForPath(const QString &relativePath); +QString Q_QMLCOMPILER_EXPORT qQmlJSSymbolNamespaceForPath(const QString &relativePath); QT_END_NAMESPACE diff --git a/src/qmlcompiler/qqmljslogger_p.h b/src/qmlcompiler/qqmljslogger_p.h index 7d6e9f2900..d7c600d311 100644 --- a/src/qmlcompiler/qqmljslogger_p.h +++ b/src/qmlcompiler/qqmljslogger_p.h @@ -15,7 +15,7 @@ // We mean it. // -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include "qcoloroutput_p.h" #include "qqmljsloggingutils_p.h" @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE \internal Used to print the line containing the location of a certain error */ -class Q_QMLCOMPILER_PRIVATE_EXPORT IssueLocationWithContext +class Q_QMLCOMPILER_EXPORT IssueLocationWithContext { public: /*! @@ -71,7 +71,7 @@ private: QStringView m_afterText; }; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSFixSuggestion +class Q_QMLCOMPILER_EXPORT QQmlJSFixSuggestion { public: QQmlJSFixSuggestion() = default; @@ -111,7 +111,7 @@ struct Message : public QQmlJS::DiagnosticMessage std::optional<QQmlJSFixSuggestion> fixSuggestion; }; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSLogger +class Q_QMLCOMPILER_EXPORT QQmlJSLogger { Q_DISABLE_COPY_MOVE(QQmlJSLogger) public: diff --git a/src/qmlcompiler/qqmljsloggingutils_p.h b/src/qmlcompiler/qqmljsloggingutils_p.h index 11196c13ac..9099a2c73c 100644 --- a/src/qmlcompiler/qqmljsloggingutils_p.h +++ b/src/qmlcompiler/qqmljsloggingutils_p.h @@ -16,7 +16,7 @@ // #include <QtCore/qstring.h> -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include "qqmljsloggingutils.h" diff --git a/src/qmlcompiler/qqmljsmetatypes_p.h b/src/qmlcompiler/qqmljsmetatypes_p.h index be2901e896..39dcb5fa3a 100644 --- a/src/qmlcompiler/qqmljsmetatypes_p.h +++ b/src/qmlcompiler/qqmljsmetatypes_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtCore/qstring.h> #include <QtCore/qstringlist.h> @@ -455,7 +455,7 @@ public: create a new binding, you know all the details of it already, so you should just set all the data at once. */ -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSMetaPropertyBinding +class Q_QMLCOMPILER_EXPORT QQmlJSMetaPropertyBinding { using BindingType = QQmlSA::BindingType; using ScriptBindingKind = QQmlSA::ScriptBindingKind; @@ -860,7 +860,7 @@ public: } }; -struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSMetaSignalHandler +struct Q_QMLCOMPILER_EXPORT QQmlJSMetaSignalHandler { QStringList signalParameters; bool isMultiline; diff --git a/src/qmlcompiler/qqmljsregistercontent_p.h b/src/qmlcompiler/qqmljsregistercontent_p.h index 01d7eb5238..bbf5008399 100644 --- a/src/qmlcompiler/qqmljsregistercontent_p.h +++ b/src/qmlcompiler/qqmljsregistercontent_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSRegisterContent +class Q_QMLCOMPILER_EXPORT QQmlJSRegisterContent { public: enum ContentVariant { diff --git a/src/qmlcompiler/qqmljsresourcefilemapper_p.h b/src/qmlcompiler/qqmljsresourcefilemapper_p.h index 618cc2edec..16fb99e82e 100644 --- a/src/qmlcompiler/qqmljsresourcefilemapper_p.h +++ b/src/qmlcompiler/qqmljsresourcefilemapper_p.h @@ -13,7 +13,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QStringList> #include <QHash> @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE -struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSResourceFileMapper +struct Q_QMLCOMPILER_EXPORT QQmlJSResourceFileMapper { struct Entry { diff --git a/src/qmlcompiler/qqmljsscope_p.h b/src/qmlcompiler/qqmljsscope_p.h index 49f144b50a..8dd5de2486 100644 --- a/src/qmlcompiler/qqmljsscope_p.h +++ b/src/qmlcompiler/qqmljsscope_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include "qqmljsmetatypes_p.h" #include "qdeferredpointer_p.h" @@ -127,7 +127,7 @@ struct ContextualTypes; } // namespace QQmlJS -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSScope +class Q_QMLCOMPILER_EXPORT QQmlJSScope { friend QQmlSA::Element; @@ -624,7 +624,7 @@ inline QQmlJSScope::ConstPtr QQmlJSScope::nonCompositeBaseType(const ConstPtr &t Q_DECLARE_TYPEINFO(QQmlJSScope::QmlIRCompatibilityBindingData, Q_RELOCATABLE_TYPE); template<> -class Q_QMLCOMPILER_PRIVATE_EXPORT QDeferredFactory<QQmlJSScope> +class Q_QMLCOMPILER_EXPORT QDeferredFactory<QQmlJSScope> { public: QDeferredFactory() = default; diff --git a/src/qmlcompiler/qqmljsshadowcheck_p.h b/src/qmlcompiler/qqmljsshadowcheck_p.h index f583c5f072..de649a6207 100644 --- a/src/qmlcompiler/qqmljsshadowcheck_p.h +++ b/src/qmlcompiler/qqmljsshadowcheck_p.h @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSShadowCheck : public QQmlJSCompilePass +class Q_QMLCOMPILER_EXPORT QQmlJSShadowCheck : public QQmlJSCompilePass { public: QQmlJSShadowCheck(const QV4::Compiler::JSUnitGenerator *jsUnitGenerator, diff --git a/src/qmlcompiler/qqmljsstoragegeneralizer_p.h b/src/qmlcompiler/qqmljsstoragegeneralizer_p.h index d04e5ce1dd..0ea6977bba 100644 --- a/src/qmlcompiler/qqmljsstoragegeneralizer_p.h +++ b/src/qmlcompiler/qqmljsstoragegeneralizer_p.h @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSStorageGeneralizer : public QQmlJSCompilePass +class Q_QMLCOMPILER_EXPORT QQmlJSStorageGeneralizer : public QQmlJSCompilePass { public: QQmlJSStorageGeneralizer(const QV4::Compiler::JSUnitGenerator *jsUnitGenerator, diff --git a/src/qmlcompiler/qqmljstypedescriptionreader_p.h b/src/qmlcompiler/qqmljstypedescriptionreader_p.h index 86cd78d420..914ca43409 100644 --- a/src/qmlcompiler/qqmljstypedescriptionreader_p.h +++ b/src/qmlcompiler/qqmljstypedescriptionreader_p.h @@ -4,7 +4,7 @@ #ifndef QQMLJSTYPEDESCRIPTIONREADER_P_H #define QQMLJSTYPEDESCRIPTIONREADER_P_H -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> // // W A R N I N G @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSTypeDescriptionReader +class Q_QMLCOMPILER_EXPORT QQmlJSTypeDescriptionReader { Q_DECLARE_TR_FUNCTIONS(QQmlJSTypeDescriptionReader) public: diff --git a/src/qmlcompiler/qqmljstypepropagator_p.h b/src/qmlcompiler/qqmljstypepropagator_p.h index 282e3dad35..d2e1b4e8f9 100644 --- a/src/qmlcompiler/qqmljstypepropagator_p.h +++ b/src/qmlcompiler/qqmljstypepropagator_p.h @@ -24,7 +24,7 @@ namespace QQmlSA { class PassManager; }; -struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSTypePropagator : public QQmlJSCompilePass +struct Q_QMLCOMPILER_EXPORT QQmlJSTypePropagator : public QQmlJSCompilePass { QQmlJSTypePropagator(const QV4::Compiler::JSUnitGenerator *unitGenerator, const QQmlJSTypeResolver *typeResolver, QQmlJSLogger *logger, diff --git a/src/qmlcompiler/qqmljstyperesolver_p.h b/src/qmlcompiler/qqmljstyperesolver_p.h index 83c9f0b11c..05c710710d 100644 --- a/src/qmlcompiler/qqmljstyperesolver_p.h +++ b/src/qmlcompiler/qqmljstyperesolver_p.h @@ -15,7 +15,7 @@ // We mean it. #include <memory> -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <private/qqmlirbuilder_p.h> #include <private/qqmljsast_p.h> @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE class QQmlJSImportVisitor; -class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSTypeResolver +class Q_QMLCOMPILER_EXPORT QQmlJSTypeResolver { public: enum ParentMode { UseDocumentParent, UseParentProperty }; diff --git a/src/qmlcompiler/qqmljsutils_p.h b/src/qmlcompiler/qqmljsutils_p.h index 82ca121fd3..27f82ec6cf 100644 --- a/src/qmlcompiler/qqmljsutils_p.h +++ b/src/qmlcompiler/qqmljsutils_p.h @@ -14,7 +14,7 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include "qqmljslogger_p.h" #include "qqmljsregistercontent_p.h" @@ -65,7 +65,7 @@ static auto getQQmlJSScopeFromSmartPtr(const From &p) -> decltype(p.get()) class QQmlJSTypeResolver; class QQmlJSScopesById; -struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSUtils +struct Q_QMLCOMPILER_EXPORT QQmlJSUtils { /*! \internal Returns escaped version of \a s. This function is mostly useful for code @@ -363,15 +363,15 @@ struct Q_QMLCOMPILER_PRIVATE_EXPORT QQmlJSUtils sourceDirectoryPath(const QQmlJSImporter *importer, const QString &buildDirectoryPath); }; -bool Q_QMLCOMPILER_PRIVATE_EXPORT canStrictlyCompareWithVar( +bool Q_QMLCOMPILER_EXPORT canStrictlyCompareWithVar( const QQmlJSTypeResolver *typeResolver, const QQmlJSScope::ConstPtr &lhsType, const QQmlJSScope::ConstPtr &rhsType); -bool Q_QMLCOMPILER_PRIVATE_EXPORT canCompareWithQObject( +bool Q_QMLCOMPILER_EXPORT canCompareWithQObject( const QQmlJSTypeResolver *typeResolver, const QQmlJSScope::ConstPtr &lhsType, const QQmlJSScope::ConstPtr &rhsType); -bool Q_QMLCOMPILER_PRIVATE_EXPORT canCompareWithQUrl( +bool Q_QMLCOMPILER_EXPORT canCompareWithQUrl( const QQmlJSTypeResolver *typeResolver, const QQmlJSScope::ConstPtr &lhsType, const QQmlJSScope::ConstPtr &rhsType); diff --git a/src/qmlcompiler/qresourcerelocater_p.h b/src/qmlcompiler/qresourcerelocater_p.h index b0c2471147..4b06a30041 100644 --- a/src/qmlcompiler/qresourcerelocater_p.h +++ b/src/qmlcompiler/qresourcerelocater_p.h @@ -14,14 +14,14 @@ // // We mean it. -#include <private/qtqmlcompilerexports_p.h> +#include <qtqmlcompilerexports.h> #include <QtCore/qstring.h> #include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE -int Q_QMLCOMPILER_PRIVATE_EXPORT qRelocateResourceFile(const QString &input, const QString &output); +int Q_QMLCOMPILER_EXPORT qRelocateResourceFile(const QString &input, const QString &output); QT_END_NAMESPACE |