diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-12-03 22:07:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-05 14:27:06 +0000 |
| commit | 1043bf202bb848f8286f2c67ed2b8760fe9da8da (patch) | |
| tree | 8a5fcb87c3f0f517bcc9b0d2e8c4c6fa88ac265a /tools | |
| parent | 5b27d02c35d7b3f3feea9c5c97119b677578621d (diff) | |
introduce /dev variants of qmake properties
these reflect the on-target paths (unlike /raw, which are host paths, just
without the -sysroot). this is necessary for anything deployment-related,
starting with RPATH.
Change-Id: I13d598995d0e4d6cb0dc1fc7938b8631cf3e3a95
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c206075646..fbf25174f6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -4054,10 +4054,9 @@ void Configure::generateQConfigCpp() << "static const char qt_configure_installation [11 + 12] = \"qt_instdate=" << QDate::currentDate().toString(Qt::ISODate) << "\";" << endl << endl << "/* Installation Info */" << endl - << "#ifndef QT_BUILD_QMAKE" << endl << "static const char qt_configure_prefix_path_str [512 + 12] = \"qt_prfxpath=" << dictionary["QT_INSTALL_PREFIX"] << "\";" << endl - << "#else" << endl - << "static const char qt_configure_prefix_path_str [512 + 12] = \"qt_prfxpath=" << dictionary["QT_EXT_PREFIX"] << "\";" << endl + << "#ifdef QT_BUILD_QMAKE" << endl + << "static const char qt_configure_ext_prefix_path_str [512 + 12] = \"qt_epfxpath=" << dictionary["QT_EXT_PREFIX"] << "\";" << endl << "static const char qt_configure_host_prefix_path_str [512 + 12] = \"qt_hpfxpath=" << dictionary["QT_HOST_PREFIX"] << "\";" << endl << "#endif" << endl << endl @@ -4085,6 +4084,7 @@ void Configure::generateQConfigCpp() << endl << "#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12\n" << "#ifdef QT_BUILD_QMAKE\n" + << "# define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12\n" << "# define QT_CONFIGURE_HOST_PREFIX_PATH qt_configure_host_prefix_path_str + 12\n" << "#endif\n"; |