Commit 519b544f authored by con's avatar con
Browse files

Merge remote branch 'origin/2.1'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
parents f6a0c691 bff0dd4a
This diff is collapsed.
......@@ -91,7 +91,7 @@
libraries to the device.
\o Choose \gui {Start > Qt SDK > Symbian > Install QtMobility to
Symbian 1 Device}
Symbian Device}
and follow the instructions on the screen to install Qt
mobility libraries to the device.
......
......@@ -65,17 +65,17 @@ GroupBox {
SliderWidget {
id: opacitySlider
minimum: 0
maximum: 100
maximum: 10
property variant pureValue: backendValues.opacity.value;
onPureValueChanged: {
if (value != pureValue * 100)
value = pureValue * 100;
if (value != pureValue * 10)
value = pureValue * 10;
}
singleStep: 5;
backendValue: backendValues.opacity
onValueChanged: {
if ((value >= 0) && (value < 100))
backendValues.opacity.value = value / 100;
if ((value >= 0) && (value <= 10))
backendValues.opacity.value = value / 10;
}
}
}
......
import Qt 4.7
import QtQuick 1.0
Rectangle {
width: 360
......
......@@ -1126,11 +1126,9 @@ void CppCodeCompletion::globalCompletion(Scope *currentScope)
completeNamespace(b);
addKeywords();
addSnippets();
qStableSort(m_completions.begin(), m_completions.end(), completionItemLessThan);
addMacros(QLatin1String("<configuration>"), context.snapshot());
addMacros(context.thisDocument()->fileName(), context.snapshot());
addSnippets();
}
static Scope *enclosingNonTemplateScope(Symbol *symbol)
......
......@@ -112,7 +112,7 @@ static inline QString getSymbolString(IDebugSymbolGroup2 *sg,
ULONG nameLength;
const HRESULT hr = (sg->*wsf)(index, nameBuffer, BufSize, &nameLength);
if (SUCCEEDED(hr)) {
nameBuffer[nameLength] = 0;
nameBuffer[qMin(nameLength, ULONG(BufSize))] = 0;
return QString::fromUtf16(reinterpret_cast<const ushort *>(nameBuffer));
}
return QString();
......
......@@ -63,7 +63,7 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
// str << CppTools::AbstractEditorSupport::licenseTemplate();
// 100:62 is the 'golden ratio'
str << QLatin1String("import Qt 4.7\n")
str << QLatin1String("import QtQuick 1.0\n")
<< QLatin1String("\n")
<< QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 100\n")
......
......@@ -114,7 +114,7 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
QTextStream out(&contents);
out
<< "import Qt 4.7" << endl
<< "import QtQuick 1.0" << endl
<< endl
<< "Rectangle {" << endl
<< " width: 360" << endl
......
......@@ -56,6 +56,7 @@ namespace {
const char * const QMAKE_BS_ID("QtProjectManager.QMakeBuildStep");
const char * const QMAKE_ARGUMENTS_KEY("QtProjectManager.QMakeBuildStep.QMakeArguments");
const char * const QMAKE_FORCED_KEY("QtProjectManager.QMakeBuildStep.QMakeForced");
}
QMakeStep::QMakeStep(BuildStepList *bsl) :
......@@ -74,7 +75,7 @@ QMakeStep::QMakeStep(BuildStepList *bsl, const QString &id) :
QMakeStep::QMakeStep(BuildStepList *bsl, QMakeStep *bs) :
AbstractProcessStep(bsl, bs),
m_forced(false),
m_forced(bs->m_forced),
m_userArgs(bs->m_userArgs)
{
ctor();
......@@ -335,13 +336,14 @@ QVariantMap QMakeStep::toMap() const
{
QVariantMap map(AbstractProcessStep::toMap());
map.insert(QLatin1String(QMAKE_ARGUMENTS_KEY), m_userArgs);
map.insert(QLatin1String(QMAKE_FORCED_KEY), m_forced);
return map;
}
bool QMakeStep::fromMap(const QVariantMap &map)
{
m_userArgs = map.value(QLatin1String(QMAKE_ARGUMENTS_KEY)).toString();
m_forced = map.value(QLatin1String(QMAKE_FORCED_KEY), false).toBool();
return BuildStep::fromMap(map);
}
......
......@@ -556,6 +556,7 @@ QString MaemoPackageCreationStep::packageFileName(const ProjectExplorer::Project
void MaemoPackageCreationStep::updateDesktopFiles(const QString &rulesFilePath)
{
QFile rulesFile(rulesFilePath);
rulesFile.setPermissions(rulesFile.permissions() | QFile::ExeUser);
if (!rulesFile.open(QIODevice::ReadWrite)) {
qWarning("Cannot open rules file for Maemo6 icon path adaptation.");
return;
......
......@@ -722,6 +722,24 @@ void Qt4PriFileNode::folderChanged(const QString &folder)
contents.updateSubFolders(this, this);
m_project->updateFileList();
// The files to be packaged are listed inside the symbian build system.
// We need to regenerate that list by running qmake
// Other platforms do not have a explicit list of files to package, but package
// directories
foreach (ProjectExplorer::Target *target, m_project->targets()) {
if (target->id() == Constants::S60_DEVICE_TARGET_ID) {
foreach (ProjectExplorer::BuildConfiguration *bc, target->buildConfigurations()) {
Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(bc);
if (qt4bc) {
QMakeStep *qmakeStep = qt4bc->qmakeStep();
if (qmakeStep)
qmakeStep->setForced(true);
}
}
}
}
}
bool Qt4PriFileNode::deploysFolder(const QString &folder) const
......
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