diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-25 10:59:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-26 11:00:57 +0200 |
| commit | 78b642eb0c2bb631793a41110df09214dccba00a (patch) | |
| tree | 80785139a4d606427debb3ea46d64e90a553e664 /src/qtcreatorplugin.pri | |
| parent | 306ca6fce07fca984960c825178df3ae7eb46b6a (diff) | |
Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri files
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 0fe283d2e8..6b9b0237cf 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -73,21 +73,10 @@ isEmpty(TARGET) { error("qtcreatorplugin.pri: You must provide a TARGET") } -isEqual(QT_MAJOR_VERSION, 5) { - defineReplace(stripOutDir) { return($$relative_path($$1, $$OUT_PWD)) } -} else { # qt5 - -defineReplace(stripOutDir) { - 1 ~= s|^$$re_escape($$OUT_PWD/)||$$i_flag - return($$1) -} - -} # qt5 - PLUGINSPEC = $$_PRO_FILE_PWD_/$${TARGET}.pluginspec PLUGINSPEC_IN = $${PLUGINSPEC}.in exists($$PLUGINSPEC_IN) { @@ -107,21 +96,19 @@ copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link no_clean QMAKE_EXTRA_COMPILERS += copy2build -greaterThan(QT_MAJOR_VERSION, 4) { # Create a Json file containing the plugin information required by # Qt 5's plugin system by running a XSLT sheet on the # pluginspec file before moc runs. - XMLPATTERNS = $$targetPath($$[QT_INSTALL_BINS]/xmlpatterns) - - pluginspec2json.name = Create Qt 5 plugin json file - pluginspec2json.input = PLUGINSPEC - pluginspec2json.variable_out = GENERATED_FILES - pluginspec2json.output = $${TARGET}.json - pluginspec2json.commands = $$XMLPATTERNS -no-format -output $$pluginspec2json.output $$PWD/qtcreatorplugin2json.xsl $$PLUGINSPEC - pluginspec2json.CONFIG += no_link - moc_header.depends += $$pluginspec2json.output - QMAKE_EXTRA_COMPILERS += pluginspec2json -} +XMLPATTERNS = $$targetPath($$[QT_INSTALL_BINS]/xmlpatterns) + +pluginspec2json.name = Create Qt 5 plugin json file +pluginspec2json.input = PLUGINSPEC +pluginspec2json.variable_out = GENERATED_FILES +pluginspec2json.output = $${TARGET}.json +pluginspec2json.commands = $$XMLPATTERNS -no-format -output $$pluginspec2json.output $$PWD/qtcreatorplugin2json.xsl $$PLUGINSPEC +pluginspec2json.CONFIG += no_link +moc_header.depends += $$pluginspec2json.output +QMAKE_EXTRA_COMPILERS += pluginspec2json macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ |