Commit 3de823ca authored by con's avatar con
Browse files

Merge remote branch 'origin/2.2'

Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp
parents 4bc1b19d 3a75137a
This diff is collapsed.
......@@ -122,22 +122,22 @@
\list 1
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.2 > Install Qt 4.7.2 for
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.3 > Install Qt 4.7.3 for
Symbian^3 on Device}. Follow the instructions on the screen to install Qt
libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.2 > Install QtMobility 1.1.0 for
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.3 > Install QtMobility 1.1.2 for
Symbian^3 on Device}
and follow the instructions on the screen to install Qt
mobility libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.2 > Install TRK
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.3 > Install TRK
(Debug Agent) for Symbian^3 on Device} and follow the
instructions on the screen to install
the App TRK debugging agent to the device.
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.2 > Install QtWebKit
for for Qt 4.7.2 on Symbian^3 Device} and follow the
\o Choose \gui {Start > Qt SDK > Symbian^3 Qt 4.7.3 > Install QtWebKit
for for Qt 4.7.3 on Symbian^3 Device} and follow the
instructions on the screen to install QtWebKit to the device.
\endlist
......@@ -152,21 +152,21 @@
\list 1
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.2 > Install Qt 4.7.1
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.3 > Install Qt 4.7.3
for Symbian^1 on Device}. Follow the instructions on the screen to install Qt
libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.2 > Install QtMobility 1.1.0
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.3 > Install QtMobility 1.1.2
for Symbian^1 on Device} and follow the instructions on the screen to install Qt
mobility libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.2 > Install TRK
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.3 > Install TRK
(Debug Agent)} for the type of the connected device and follow the
instructions on the screen to install
the App TRK debugging agent to the device.
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.2 > Install QtWebKit
for for Qt 4.7.2 on Symbian^1 Device} and follow the
\o Choose \gui {Start > Qt SDK > Symbian^1 Qt 4.7.3 > Install QtWebKit
for for Qt 4.7.3 on Symbian^1 Device} and follow the
instructions on the screen to install QtWebKit to the device.
\endlist
......@@ -237,8 +237,7 @@
\o \l{http://www.forum.nokia.com/info/sw.nokia.com/id/ec866fab-4b76-49f6-b5a5-af0631419e9c/S60_All_in_One_SDKs.html}
{S60 Platform SDK 3rd Edition FP1 or higher}.
\o Either the GCCE ARM Toolchain that is included in the Symbian
SDKs, or RVCT 2.2 [build 686] or later (which is not available free
of charge)(Your environment needs to find the compiler in the PATH).
SDKs, or RVCT 2.2 [build 686] or later (which requires a license).
\o Qt for Symbian 4.6.2 or later, installed into the Symbian SDKs you want
to use.
......@@ -252,21 +251,11 @@
is made in the Qt version management settings in \gui{Tools} >
\gui{Options...} > \gui{Qt4} > \gui{Qt Versions}.
\note If you manually add a Qt version for Symbian, you must
If you manually add a Qt version for Symbian, you must
also manually specify the Symbian SDK to use for this version.
\image qtcreator-qt4-qtversions-win-symbian.png
If you want to run your applications in the Symbian emulator, you need to
point Qt Creator to the Metrowerks Compiler that you want to use, by
setting the \gui{Carbide directory} of the Qt version to the corresponding
Carbide.c++ installation directory.
You can check which Symbian SDKs and corresponding Qt versions are found in the
\gui{Tools} > \gui{Options...} > \gui{Qt4} > \gui{S60 SDKs} preference
page.
\image qtcreator-qt4-s60sdks.png
For more information about adding Qt versions and tool chains, see
\l{Setting Up Qt for Symbian Versions} and \l{Adding Tool Chains}.
\else
......
......@@ -20,9 +20,9 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator.qmldump</string>
<key>CFBundleVersion</key>
<string>2.1.80</string>
<string>2.1.83</string>
<key>CFBundleShortVersionString</key>
<string>2.1.80</string>
<string>2.1.83</string>
<key>LSUIElement</key>
<string>1</string>
</dict>
......
......@@ -136,8 +136,9 @@ QDeclarativeViewObserver::QDeclarativeViewObserver(QDeclarativeView *view, QObje
data->debugService = QDeclarativeObserverService::instance();
connect(data->debugService, SIGNAL(debuggingClientChanged(bool)),
data.data(), SLOT(_q_setToolBoxVisible(bool)));
// tool box is disabled
//connect(data->debugService, SIGNAL(debuggingClientChanged(bool)),
// data.data(), SLOT(_q_setToolBoxVisible(bool)));
connect(data->debugService, SIGNAL(designModeBehaviorChanged(bool)),
SLOT(setDesignModeBehavior(bool)));
......@@ -205,6 +206,8 @@ void QDeclarativeViewObserverPrivate::_q_setToolBoxVisible(bool visible)
createToolBox();
if (toolBox)
toolBox->setVisible(visible);
#else
Q_UNUSED(visible)
#endif
}
......
import Qt 4.7
import Bauhaus 1.0
//backendValue: backendValues.horizontalVelocity;
//backendValue: backendValues.verticalVelocity;
//backendValue: backendValues.maximumFlickVelocity;
//backendValue: backendValues.overShoot;
//boundsBehavior : enumeration
//contentHeight : int
//contentWidth : int
QWidget {
layout: QVBoxLayout {
topMargin: 0
......@@ -17,9 +8,130 @@ QWidget {
leftMargin: 0
rightMargin: 0
spacing: 0
GroupBox {
finished: finishedNotify;
caption: qsTr("Flickable")
GroupBox {
finished: finishedNotify;
caption: qsTr("Flickable")
layout: VerticalLayout {
QWidget { // 1
layout: HorizontalLayout {
Label {
text: qsTr("Content Size")
}
DoubleSpinBox {
text: "W"
alignRight: false
spacing: 4
singleStep: 1;
backendValue: backendValues.contentWidth
minimum: 0;
maximum: 8000;
baseStateFlag: isBaseState;
}
DoubleSpinBox {
singleStep: 1;
text: "H"
alignRight: false
spacing: 4
backendValue: backendValues.contentHeight
minimum: 0;
maximum: 8000;
baseStateFlag: isBaseState;
}
}
} //QWidget //1
QWidget {
layout: HorizontalLayout {
Label {
text: qsTr("Flickable Direction")
}
ComboBox {
baseStateFlag: isBaseState
items : { ["AutoFlickDirection", "HorizontalFlick", "VerticalFlick", "HorizontalAndVerticalFlick"] }
currentText: backendValues.flickableDirection.value;
onItemsChanged: {
currentText = backendValues.flickableDirection.value;
}
backendValue: backendValues.flickableDirection
}
}
} //QWidget
QWidget {
layout: HorizontalLayout {
Label {
text: qsTr("Bounds Behavior")
}
ComboBox {
baseStateFlag: isBaseState
items : { ["StopAtBounds", "DragOverBounds", "DragAndOvershootBounds"] }
currentText: backendValues.boundsBehavior.value;
onItemsChanged: {
currentText = backendValues.boundsBehavior.value;
}
backendValue: backendValues.boundsBehavior
}
}
} //QWidget
QWidget {
layout: HorizontalLayout {
Label {
text:qsTr("Interactive")
}
CheckBox {
text: ""
backendValue: backendValues.interactive;
baseStateFlag: isBaseState;
checkable: true;
}
}
}// QWidget
QWidget {
layout: HorizontalLayout {
Label {
text: qsTr("Max. Velocity")
toolTip: qsTr("Maximum Flick Velocity")
}
DoubleSpinBox {
text: ""
alignRight: false
spacing: 4
singleStep: 1;
backendValue: backendValues.maximumFlickVelocity
minimum: 0;
maximum: 8000;
baseStateFlag: isBaseState;
}
}
} //QWidget
QWidget {
layout: HorizontalLayout {
Label {
text: qsTr("Deceleration")
toolTip: qsTr("Flick Deceleration")
}
DoubleSpinBox {
text: ""
alignRight: false
spacing: 4
singleStep: 1;
backendValue: backendValues.flickDeceleration
minimum: 0;
maximum: 8000;
baseStateFlag: isBaseState;
}
}
} //QWidget
}
}
}
}
\ No newline at end of file
}
......@@ -13,6 +13,31 @@ GroupBox {
property bool hasBorder
property variant colorAlpha: colorGroupBox.alpha
property bool hasGradient: backendValues.gradient.isInModel
onHasGradientChanged: {
print("onGradientInModelChanged")
if (backendValues.gradient.isInModel) {
print("inmodel")
colorGroupBox.setGradientButtonChecked = true;
} else {
print("else")
if (colorGroupBox.alpha == 0)
colorGroupBox.setNoneButtonChecked = true;
else
colorGroupBox.setSolidButtonChecked = true;
}
}
onColorAlphaChanged: {
if (backendValues.gradient.isInModel)
return
if (colorGroupBox.alpha == 0)
colorGroupBox.setNoneButtonChecked = true;
else
colorGroupBox.setSolidButtonChecked = true;
}
onSelectionFlagChanged: {
isSetup = true;
......@@ -112,12 +137,17 @@ GroupBox {
backendColor: backendValues.border_color
property variant backendColorValue: backendValues.border_color.vlaue
property bool backendColorValue: backendValues.border_color.isInModel
enabled: isBaseState || hasBorder
onBackendColorValueChanged: {
if (backendValues.border_color.isInModel)
if (backendValues.border_color.isInModel) {
borderColorBox.setSolidButtonChecked = true;
hasBorder = true;
} else {
borderColorBox.setNoneButtonChecked = true;
hasBorder = false;
}
}
onNoneButtonCheckedChanged: {
......
......@@ -180,6 +180,7 @@ QToolButton
background: none;
border: none;
background-color: none;
color: #dedede;
}
QToolButton::pressed
......
......@@ -82,6 +82,7 @@ public:
static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugRootContextQuery *);
static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugObjectQuery *);
static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugExpressionQuery *);
static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugWatch *);
QHash<int, QDeclarativeDebugEnginesQuery *> enginesQuery;
QHash<int, QDeclarativeDebugRootContextQuery *> rootContextQuery;
......@@ -122,6 +123,41 @@ QDeclarativeEngineDebugPrivate::~QDeclarativeEngineDebugPrivate()
{
if (client)
client->priv = 0;
delete client;
QHash<int, QDeclarativeDebugEnginesQuery*>::iterator enginesIter = enginesQuery.begin();
for (; enginesIter != enginesQuery.end(); ++enginesIter) {
enginesIter.value()->m_client = 0;
if (enginesIter.value()->state() == QDeclarativeDebugQuery::Waiting)
enginesIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugRootContextQuery*>::iterator rootContextIter = rootContextQuery.begin();
for (; rootContextIter != rootContextQuery.end(); ++rootContextIter) {
rootContextIter.value()->m_client = 0;
if (rootContextIter.value()->state() == QDeclarativeDebugQuery::Waiting)
rootContextIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugObjectQuery*>::iterator objectIter = objectQuery.begin();
for (; objectIter != objectQuery.end(); ++objectIter) {
objectIter.value()->m_client = 0;
if (objectIter.value()->state() == QDeclarativeDebugQuery::Waiting)
objectIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugExpressionQuery*>::iterator exprIter = expressionQuery.begin();
for (; exprIter != expressionQuery.end(); ++exprIter) {
exprIter.value()->m_client = 0;
if (exprIter.value()->state() == QDeclarativeDebugQuery::Waiting)
exprIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugWatch*>::iterator watchIter = watched.begin();
for (; watchIter != watched.end(); ++watchIter) {
watchIter.value()->m_client = 0;
watchIter.value()->setState(QDeclarativeDebugWatch::Dead);
}
}
int QDeclarativeEngineDebugPrivate::getId()
......@@ -146,6 +182,14 @@ void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c,
}
}
void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugWatch *w)
{
if (c && w) {
QDeclarativeEngineDebugPrivate *p = c->d_func();
p->watched.remove(w->m_queryId);
}
}
// from qdeclarativeenginedebug_p.h
struct QDeclarativeObjectData {
QUrl url;
......@@ -689,6 +733,8 @@ QDeclarativeDebugWatch::QDeclarativeDebugWatch(QObject *parent)
QDeclarativeDebugWatch::~QDeclarativeDebugWatch()
{
if (m_client && m_queryId != -1)
QDeclarativeEngineDebugPrivate::remove(m_client, this);
}
int QDeclarativeDebugWatch::queryId() const
......
......@@ -80,6 +80,12 @@ QString FileInProjectFinder::projectDirectory() const
return m_projectDir;
}
void FileInProjectFinder::setProjectFiles(const QStringList &projectFiles)
{
m_projectFiles = projectFiles;
m_cache.clear();
}
/**
Returns the best match for the given originalPath in the project directory.
......@@ -87,6 +93,8 @@ QString FileInProjectFinder::projectDirectory() const
If not, the leading directory in the path is stripped, and the - now shorter - path is
checked for existence. This continues until either the file is found, or the relative path
does not contain any directories any more: In this case the originalPath is returned.
Second, we walk the list of project files, and search for a file name match there.
*/
QString FileInProjectFinder::findFile(const QString &originalPath, bool *success) const
{
......@@ -125,6 +133,16 @@ QString FileInProjectFinder::findFile(const QString &originalPath, bool *success
}
}
const QString fileName = QFileInfo(originalPath).fileName();
foreach (const QString &f, m_projectFiles) {
if (QFileInfo(f).fileName() == fileName) {
m_cache.insert(originalPath, f);
if (success)
*success = true;
return f;
}
}
if (success)
*success = false;
......
......@@ -37,7 +37,7 @@
#include <utils/utils_global.h>
#include <QtCore/QHash>
#include <QtCore/QString>
#include <QtCore/QStringList>
namespace Utils {
......@@ -49,10 +49,13 @@ public:
void setProjectDirectory(const QString &absoluteProjectPath);
QString projectDirectory() const;
void setProjectFiles(const QStringList &projectFiles);
QString findFile(const QString &originalPath, bool *success = 0) const;
private:
QString m_projectDir;
QStringList m_projectFiles;
mutable QHash<QString,QString> m_cache;
};
......
Markdown is supported
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