Commit f1cec462 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
parents 9d29b251 6d8d85b1
Qt Creator version 2.6.2 is a bugfix release.
The most important changes are listed in this document. For a complete
list of changes, see the Git log for the Qt Creator sources that
you can check out from the public Git repository. For example:
git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v2.6.1..v2.6.2
General
* Fixed Qt version in VersionDialog
* Improved kits set up (QTCREATORBUG-8576, QTCREATORBUG-8081)
* Fixed editing of kits sysroot and mkspec (QTCREATORBUG-8586)
* Fixed excessive emission of change signals from KitManager
* Fixed display of Visual Studio compiler installations
(QTCREATORBUG-8487)
* Fixed integrity of device settings when closing option page
* Fixed update of examples when default kit changes
Editing
* Fixed crash when closing some editors while tooltip is active
(QTCREATORBUG-8630)
* Fixed warning about empty file in memory editor
Managing Projects
* Added check if file is readable when determining its ABI
* Fixed warning about running processes with empty environment
QMake Projects
* Fixed display of directories in warnings (QTCREATORBUG-8585)
* Added QMAKE_INCDIR to headers search paths
CMake Projects
Debugging
* Sped up disassembly retrieval
* Updated documentation of command-line arguments
* Fixed visibility of Debugging Helper Dialog (QTCREATORBUG-8440)
Analyzer
C++ Support
* Fixed invalid common prefix calculation which led to freezes
(QTCREATORBUG-8472, QTCREATORBUG-8532)
QML/JS Support
* Fixed Qt version in qmlobserver
GLSL Support
Help
Qt Designer
Qt Quick Designer
* Fixed some parts of the tutorial
Version control plugins
Git
SVN
ClearCase
* Fixed focus on Check Out dialog
FakeVim
Platform Specific
Mac
Linux
Windows
Remote Linux Support
* Documented deployment settings for generic Linux devices
QNX
* Fixed log output
* Fixed update of path chooser model when browsing finishes
* Fixed saving of changes to BlackBerry deploy information
* Fixed QML_IMPORT_PATH setting in shipped bar-descriptor.xml files
Android
* Fixed crash when pressing stop button
Madde
Pastebin:
* Fixed pasting of .cpp files
Testing
* Enabled squish tests with MSVC again
* Fixed some squish tests
* Added test for QML outline
Tools
* Fixed addQt test in SDKTool
* Fixed creation of group/world readable files in SDKTool
(QTCREATORBUG-8458)
* Fixed leak in zeroconf
Packaging
* Use x86 instead of i386 for file names
Credits for these changes go to:
Aurindam Jana
BogDan Vatra
Christian Stenger
Daniel Teske
David Schulz
Eike Ziller
Erik Verbruggen
Friedemann Kleint
André Pönitz
Leena Miettinen
Mehdi Fekari
Montel Laurent
Orgad Shaneh
Robert Loehning
Sergey Belyashov
Tobias Hunger
Tobias Nätterlund
......@@ -5,7 +5,8 @@ headerdirs =
sourcedirs = $SRCDIR/src
imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = $OUTDIR
exampledirs = $SRCDIR/examples
exampledirs = $SRCDIR/examples \
$SRCDIR/snippets
indexes = qt.index
include(compat.qdocconf)
......
\section2 Specifying Run Settings for Linux-Based Devices
To run an application on a Linux-based device (embedded Linux, MeeGo
Harmattan, or Maemo), create and select a device configuration in the
\l{glossary-buildandrun-kit}{kit} that is used for building and running the project and set its
device type correspondingly.
You can also pass command line arguments to your application.
\image qtcreator-screenshot-run-settings-maemo.png "Run settings for Linux-based devices"
To run and debug applications on Linux-based devices, you must
create connections from the development PC to the devices. Click
\gui {Manage device configurations} to create connections. For more
information, see \l{Configuring Connections to Maemo Devices},
To run and debug an application on a Linux-based device (embedded Linux,
MeeGo Harmattan, or Maemo), you must create connections from the development
host to the device and add the device configurations to
\l{glossary-buildandrun-kit}{kits}. Click \gui {Manage Kits} to add devices
to kits. For more information, see
\l{Configuring Connections to Maemo Devices},
\l{Configuring Connections to Harmattan Devices}, and
\l {Connecting Embedded Linux Devices}.
......@@ -23,3 +17,14 @@
on devices that are of the same type and run the same firmware as the
connected device. For more information, see
\l{Deploying Applications to Linux-Based Devices}.
For generic embedded Linux devices, the run settings display the path to the
executable file on the development host and on the device. To specify that
another application launches your application, for example, enter the
command in the \gui {Alternate executable on device} field and select the
\gui {Use this command instead} check box.
\image qtcreator-run-settings-linux.png "Run settings for Linux-based devices"
You can specify command line arguments to pass to your application in the
\gui Arguments field.
......@@ -293,7 +293,7 @@
expressions for the x and y properties, as illustrated by the
following code snippet:
\snippet snippets/qml/states-properties.qml states
\snippet qml/states-properties.qml states
\image qmldesigner-tutorial-state1.png "States"
......@@ -319,7 +319,7 @@
moving to State1, the x and y coordinates of the Qt logo change
linearly over a duration of 1 second:
\snippet snippets/qml/list-of-transitions.qml first transition
\snippet qml/list-of-transitions.qml first transition
\o You can use the Qt Quick toolbar for animation to change the easing
curve type from linear to OutBounce:
......@@ -342,13 +342,13 @@
and y coordinates of the Qt logo change over a duration of 2
seconds, and an InOutQuad easing function is used:
\snippet snippets/qml/list-of-transitions.qml second transition
\snippet qml/list-of-transitions.qml second transition
\o Add the following code to specify that for any other state changes,
the x and y coordinates of the Qt logo change linearly over a
duration of 200 milliseconds:
\snippet snippets/qml/list-of-transitions.qml default transition
\snippet qml/list-of-transitions.qml default transition
\o Press \key {Ctrl+R} to run the application.
......
......@@ -337,7 +337,7 @@ static void parseCommandLineOptions(const QStringList &arguments)
if (lastArg) usage();
qApp->setStartDragDistance(arguments.at(++i).toInt());
} else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
qWarning("Qt QML Viewer version %s", QT_VERSION_STR);
qWarning("Qt QML Viewer version %s", qVersion());
exitApp(0);
} else if (arg == "-translation") {
if (lastArg) usage();
......
......@@ -13,7 +13,7 @@
</initialWindow>
<publisher>PUBLISHER</publisher>
<copyright>COPYRIGHT</copyright>
<env var="QML_IMPORT_PATH" value="app/native/imports"/>
<env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
<env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>
<arg>-style</arg>
......
......@@ -12,7 +12,7 @@
<aspectRatio>landscape</aspectRatio>
</initialWindow>
<env var="QML_IMPORT_PATH" value="app/native/imports"/>
<env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
<env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>
......
......@@ -12,7 +12,7 @@
<aspectRatio>landscape</aspectRatio>
</initialWindow>
<env var="QML_IMPORT_PATH" value="app/native/imports"/>
<env var="QML_IMPORT_PATH" value="app/native/imports:/usr/lib/qt4/imports"/>
<env var="QT_PLUGIN_PATH" value="app/native/plugins:/usr/lib/qt4/plugins"/>
<env var="LD_LIBRARY_PATH" value="app/native/lib:/usr/lib/qt4/lib/"/>
......
......@@ -72,7 +72,9 @@ QTipLabel::QTipLabel(QWidget *parent) :
QTipLabel::~QTipLabel()
{
delete m_tipContent;
Utils::TipContent *tmpTipContent = m_tipContent;
m_tipContent = 0;
delete tmpTipContent;
}
bool QTipLabel::isInteractive() const
......
......@@ -322,12 +322,12 @@ public:
DNSServiceErrorType createConnection(MainConnection *mainConnection, ConnectionRef *sdRef) {
if (!m_simplePollNew || !m_clientNew || !m_simplePollSetFunc)
return kDNSServiceErr_Unknown;
MyAvahiConnection *connection = new MyAvahiConnection;
connection->lib = this;
if (sdRef == 0) {
qDebug() << "Error: sdRef is null in createConnection";
return kDNSServiceErr_Unknown;
}
MyAvahiConnection *connection = new MyAvahiConnection;
connection->lib = this;
/* Allocate main loop object */
connection->simple_poll = m_simplePollNew();
if (!connection->simple_poll) {
......
......@@ -49,7 +49,7 @@ using namespace Core;
using namespace Core::Internal;
CorePlugin::CorePlugin() :
m_mainWindow(new MainWindow), m_editMode(0)
m_mainWindow(new MainWindow), m_editMode(0), m_designMode(0)
{
}
......
......@@ -86,7 +86,7 @@ VersionDialog::VersionDialog(QWidget *parent)
"INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
"PARTICULAR PURPOSE.<br/>")
.arg(version,
QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize),
QLatin1String(qVersion()), QString::number(QSysInfo::WordSize),
QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(Constants::IDE_YEAR),
(QLatin1String(Constants::IDE_AUTHOR)), ideVersionDescription,
ideRev);
......
......@@ -82,6 +82,7 @@ static inline QByteArray format(Protocol::ContentType ct)
break;
case Protocol::Cpp:
format += "cpp-qt";
break;
case Protocol::JavaScript:
format += "javascript";
break;
......
......@@ -199,6 +199,11 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons
return result;
}
void DebuggerKitInformation::setup(Kit *k)
{
setDebuggerItem(k, autoDetectItem(k));
}
// Check the configuration errors and return a flag mask. Provide a quick check and
// a verbose one with a list of errors.
......
......@@ -65,6 +65,8 @@ public:
QList<ProjectExplorer::Task> validate(const ProjectExplorer::Kit *k) const
{ return DebuggerKitInformation::validateDebugger(k); }
void setup(ProjectExplorer::Kit *k);
static QList<ProjectExplorer::Task> validateDebugger(const ProjectExplorer::Kit *k);
static bool isValidDebugger(const ProjectExplorer::Kit *k);
......
......@@ -4484,11 +4484,15 @@ void GdbEngine::fetchDisassemblerByCliPointMixed(const DisassemblerAgentCookie &
void GdbEngine::fetchDisassemblerByCliPointPlain(const DisassemblerAgentCookie &ac0)
{
DisassemblerAgentCookie ac = ac0;
QTC_ASSERT(ac.agent, return);
postCommand(disassemblerCommand(ac.agent->location(), false), Discardable,
CB(handleFetchDisassemblerByCliPointPlain),
QVariant::fromValue(ac));
// This here
// DisassemblerAgentCookie ac = ac0;
// QTC_ASSERT(ac.agent, return);
// postCommand(disassemblerCommand(ac.agent->location(), false), Discardable,
// CB(handleFetchDisassemblerByCliPointPlain),
// QVariant::fromValue(ac));
// takes far too long if function boundaries are not hit.
// Skip this feature and immediately fall back to the 'range' version:
fetchDisassemblerByCliRangePlain(ac0);
}
void GdbEngine::fetchDisassemblerByCliRangeMixed(const DisassemblerAgentCookie &ac0)
......
......@@ -71,7 +71,6 @@ public:
void emitConfigurationChanged();
private:
bool m_enabled;
PerforcePlugin *m_plugin;
};
......
......@@ -676,7 +676,9 @@ QList<Abi> Abi::abisOfBinary(const Utils::FileName &path)
if (!f.exists())
return tmp;
f.open(QFile::ReadOnly);
if (!f.open(QFile::ReadOnly))
return tmp;
QByteArray data = f.read(1024);
if (data.size() >= 67
&& getUint8(data, 0) == '!' && getUint8(data, 1) == '<' && getUint8(data, 2) == 'a'
......
......@@ -200,6 +200,21 @@ void Kit::fix()
i->fix(this);
}
void Kit::setup()
{
KitGuard g(this);
QHash<Core::Id, QVariant> data = d->m_data;
for (int i = 0; i < 5; ++i) {
// Allow for some retries to settle down in a good configuration
// This is necessary for the Qt version to pick its preferred tool chain
// and that to pick a working debugger afterwards.
foreach (KitInformation *i, KitManager::instance()->kitInformation())
i->setup(this);
if (d->m_data == data)
break;
}
}
QString Kit::displayName() const
{
return d->m_displayName;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment