path: root/qmake/property.cpp
diff options
authorThiago Macieira <>2012-09-24 14:30:45 +0200
committerThe Qt Project <>2012-11-11 07:41:50 +0100
commit4712b0e99fdb90b6cbfe12ad16e534b49cd98343 (patch)
treeaed31b896e4f6ea6c1f0a0dea5a9af8da4d91f14 /qmake/property.cpp
parent2d07d3b4e3036179667a822aa40285d071b76b9e (diff)
Add -archdatadir and change some of the default install dirs in Qt 5.
Architecture-depedent Qt data defaults now to something under -archdatadir. Architecture-dependent data is everything that contains machine code (e.g., plugins) as well as anything that hardcodes build-specific data, like qconfig.pri and qmodule.pri. That is: QML imports: $archdatadir/imports (includes plugins) Qt plugins: $archdatadir/plugins (machine code) Mkspecs: $archdatadir/mkspecs (build-specific) Architecture-independent Qt data defaults now to something under -datadir. This option existed in Qt 4, but did not differentiate between arch-dependent and independent. Following Autoconf's lead, --datadir is the *independent* data root. translations: $datadir/translations (.qm files are arch-independent) docs: $datadir/doc By default, both new options are equal to the Qt install prefix. (Strictly speaking, for complete Autoconf compatibility, we'd need a --datarootdir=$prefix/share, --datadir=$datarootdir/qt5 and --docdir=$datarootdir/doc/qt5, but that's just nitpicking and unnecessary) Change-Id: I39c886a6a2d2d2c0b11923c50974179e21f2af76 Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'qmake/property.cpp')
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp
index f1e9ba63ac..35f0ba9e7b 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -56,6 +56,7 @@ static const struct {
} propList[] = {
{ "QT_SYSROOT", QLibraryInfo::SysrootPath, true },
{ "QT_INSTALL_PREFIX", QLibraryInfo::PrefixPath, false },
+ { "QT_INSTALL_ARCHDATA", QLibraryInfo::ArchDataPath, false },
{ "QT_INSTALL_DATA", QLibraryInfo::DataPath, false },
{ "QT_INSTALL_DOCS", QLibraryInfo::DocumentationPath, false },
{ "QT_INSTALL_HEADERS", QLibraryInfo::HeadersPath, false },