feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

add ProFileOption::initProperties()

Browse Source 
centralize support for default-initialization of qmake properties with,
duh, qmake (-query).

Change-Id: If97725fa61779819f6afb9073042b667d7253e5d
Reviewed-on: http://codereview.qt.nokia.com/308
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2011-06-01 16:01:22 +02:00
parent 9e7ad28ce5
commit 3cb595fa34
4 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/manual/proparser/main.cpp
+1 -23
View File
@@ -160,33 +160,11 @@ int main(int argc, char **argv)
qFatal("need at least two arguments: [-v] <cumulative?> <filenme> [<out_pwd> [<qmake options>]]");
ProFileOption option;
option.initProperties(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake"));
if (args.count() >= 4)
option.setCommandLineArguments(args.mid(3));
ProFileParser parser(0, &parseHandler);
static const struct {
const char * const name;
QLibraryInfo::LibraryLocation index;
} props[] = {
{ "QT_INSTALL_DATA", QLibraryInfo::DataPath },
{ "QT_INSTALL_LIBS", QLibraryInfo::LibrariesPath },
{ "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath },
{ "QT_INSTALL_HEADERS", QLibraryInfo::HeadersPath },
{ "QT_INSTALL_DEMOS", QLibraryInfo::DemosPath },
{ "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath },
{ "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath },
{ "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath },
{ "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath },
{ "QT_INSTALL_BINS", QLibraryInfo::BinariesPath },
{ "QT_INSTALL_DOCS", QLibraryInfo::DocumentationPath },
{ "QT_INSTALL_PREFIX", QLibraryInfo::PrefixPath }
};
for (unsigned i = 0; i < sizeof(props)/sizeof(props[0]); ++i)
option.properties.insert(QLatin1String(props[i].name),
QLibraryInfo::location(props[i].index));
option.properties.insert(QLatin1String("QT_VERSION"), QLatin1String(qVersion()));
bool cumulative = args[0] == QLatin1String("true");
QFileInfo infi(args[1]);
QString file = infi.absoluteFilePath();