diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/configure.pri b/configure.pri index ecd46b8e38..35cc08d694 100644 --- a/configure.pri +++ b/configure.pri @@ -699,7 +699,6 @@ defineReplace(printInstallPaths) { $$printInstallPath(LibraryExecutables, libexecdir, $$DEFAULT_LIBEXEC) \ $$printInstallPath(Binaries, bindir, bin) \ $$printInstallPath(Plugins, plugindir, plugins) \ - $$printInstallPath(Imports, importdir, imports) \ $$printInstallPath(Qml2Imports, qmldir, qml) \ $$printInstallPath(ArchData, archdatadir, .) \ $$printInstallPath(Data, datadir, .) \ @@ -763,6 +762,11 @@ defineTest(qtConfOutput_preparePaths) { have_hostprefix = true } + equals(config.input.prefix, $$config.input.extprefix): \ + qmake_crossbuild = false + else: \ + qmake_crossbuild = true + PREFIX_COMPLAINTS = PREFIX_REMINDER = false win32: \ @@ -789,7 +793,6 @@ defineTest(qtConfOutput_preparePaths) { archdata_pfx = $$config.rel_input.archdatadir/ processQtPath("", libexecdir, $${archdata_pfx}$$DEFAULT_LIBEXEC) processQtPath("", plugindir, $${archdata_pfx}plugins) - processQtPath("", importdir, $${archdata_pfx}imports) processQtPath("", qmldir, $${archdata_pfx}qml) processQtPath("", sysconfdir, $$DEFAULT_SYSCONFDIR) $$have_hostprefix { @@ -802,6 +805,18 @@ defineTest(qtConfOutput_preparePaths) { processQtPath(host, hostdatadir, $$config.rel_input.archdatadir) } + win32:$$qtConfEvaluate("features.shared") { + # Windows DLLs are in the bin dir. + libloc_absolute_path = $$absolute_path($$config.rel_input.bindir, $$config.input.prefix) + } else { + libloc_absolute_path = $$absolute_path($$config.rel_input.libdir, $$config.input.prefix) + } + config.input.liblocation_to_prefix = $$relative_path($$config.input.prefix, $$libloc_absolute_path) + + hostbindir_absolute_path = $$absolute_path($$config.rel_input.hostbindir, $$config.input.hostprefix) + config.input.hostbindir_to_hostprefix = $$relative_path($$config.input.hostprefix, $$hostbindir_absolute_path) + config.input.hostbindir_to_extprefix = $$relative_path($$config.input.extprefix, $$hostbindir_absolute_path) + !isEmpty(PREFIX_COMPLAINTS) { PREFIX_COMPLAINTS = "$$join(PREFIX_COMPLAINTS, "$$escape_expand(\\n)Note: ")" $$PREFIX_REMINDER: \ @@ -821,7 +836,6 @@ defineTest(qtConfOutput_preparePaths) { addConfStr($$config.rel_input.libexecdir) addConfStr($$config.rel_input.bindir) addConfStr($$config.rel_input.plugindir) - addConfStr($$config.rel_input.importdir) addConfStr($$config.rel_input.qmldir) addConfStr($$config.rel_input.archdatadir) addConfStr($$config.rel_input.datadir) @@ -843,9 +857,6 @@ defineTest(qtConfOutput_preparePaths) { addConfStr($$[QMAKE_SPEC]) $${currentConfig}.output.qconfigSource = \ - "/* Installation date */" \ - "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ - "" \ "/* Installation Info */" \ "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \ "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \ @@ -867,9 +878,13 @@ defineTest(qtConfOutput_preparePaths) { ";" \ "" \ "$${LITERAL_HASH}define QT_CONFIGURE_SETTINGS_PATH \"$$config.rel_input.sysconfdir\"" \ + "$${LITERAL_HASH}define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH \"$$config.input.liblocation_to_prefix\"" \ + "$${LITERAL_HASH}define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH \"$$config.input.hostbindir_to_extprefix\"" \ + "$${LITERAL_HASH}define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH \"$$config.input.hostbindir_to_hostprefix\"" \ "" \ "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \ "$${LITERAL_HASH} define QT_CONFIGURE_SYSROOTIFY_PREFIX $$qmake_sysrootify" \ + "$${LITERAL_HASH} define QT_CONFIGURE_CROSSBUILD $$qmake_crossbuild" \ "$${LITERAL_HASH}endif" \ "" \ "$${LITERAL_HASH}define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12" \ |