← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/qnx/qnxqtversion.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-11-15 12:25:23 UTC
  • mfrom: (1.1.28)
  • Revision ID: timo.jyrinki@canonical.com-20131115122523-i2kyamsu4gs2mu1m
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/qnx/qnxqtversion.cpp
1
1
/**************************************************************************
2
2
**
3
 
** Copyright (C) 2011 - 2013 Research In Motion
 
3
** Copyright (C) 2012, 2013 BlackBerry Limited. All rights reserved.
4
4
**
5
 
** Contact: Research In Motion (blackberry-qt@qnx.com)
 
5
** Contact: BlackBerry (qt@blackberry.com)
6
6
** Contact: KDAB (info@kdab.com)
7
7
**
8
8
** This file is part of Qt Creator.
33
33
 
34
34
#include "qnxconstants.h"
35
35
 
 
36
#include "qnxutils.h"
 
37
 
36
38
#include <coreplugin/featureprovider.h>
37
39
#include <utils/hostosinfo.h>
38
40
 
92
94
    return tr("QNX Software Development Platform:");
93
95
}
94
96
 
95
 
QMultiMap<QString, QString> QnxQtVersion::environment() const
 
97
QList<Utils::EnvironmentItem> QnxQtVersion::environment() const
96
98
{
97
 
    // Mimic what the SDP installer puts into the system environment
98
 
 
99
 
    QMultiMap<QString, QString> environment;
100
 
 
101
 
    if (Utils::HostOsInfo::isWindowsHost()) {
102
 
        // TODO:
103
 
        //environment.insert(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"));
104
 
        environment.insert(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath() + QLatin1String("/target/qnx6"));
105
 
        environment.insert(QLatin1String(Constants::QNX_HOST_KEY), sdkPath() + QLatin1String("/host/win32/x86"));
106
 
 
107
 
        environment.insert(QLatin1String("PATH"), sdkPath() + QLatin1String("/host/win32/x86/usr/bin"));
108
 
 
109
 
        // TODO:
110
 
        //environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin"));
111
 
    } else if (Utils::HostOsInfo::isAnyUnixHost()) {
112
 
        environment.insert(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"));
113
 
        environment.insert(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath() + QLatin1String("/target/qnx6"));
114
 
        environment.insert(QLatin1String(Constants::QNX_HOST_KEY), sdkPath() + QLatin1String("/host/linux/x86"));
115
 
 
116
 
        environment.insert(QLatin1String("PATH"), sdkPath() + QLatin1String("/host/linux/x86/usr/bin"));
117
 
        environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin"));
118
 
 
119
 
        environment.insert(QLatin1String("LD_LIBRARY_PATH"), sdkPath() + QLatin1String("/host/linux/x86/usr/lib"));
120
 
    }
121
 
 
122
 
    environment.insert(QLatin1String("QNX_JAVAHOME"), sdkPath() + QLatin1String("/_jvm"));
123
 
    environment.insert(QLatin1String("MAKEFLAGS"), QLatin1String("-I") + sdkPath() + QLatin1String("/target/qnx6/usr/include"));
124
 
 
125
 
    return environment;
 
99
    return QnxUtils::qnxEnvironment(sdkPath());
126
100
}