diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 6713d82e6d85117851d6c71608b68240236e1dff..f9e55ba866d0909ff7144a0b46bffad57576eb73 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5,13 +5,13 @@
\title Qt Creator Manual
- \section1 Version 0.9.1 (Beta)
+ \section1 Version 0.9.2 (Release Candidate)
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
the Linux, Mac OS X and Windows platforms.
- \note The current version of Qt Creator is 0.9.2 (Beta). It is
+ \note The current version of Qt Creator is 0.9.2 (Release Candidate). It is
possible to edit source code, compile, run and debug applications; other
features are still under development. Please send bug reports and
suggestions to qt-creator@trolltech.com. To subscribe, send a
@@ -59,7 +59,7 @@
\o \l{Tips and Tricks}
\o \l{Keyboard Shortcuts}
\o \l{Glossary}
- \o \l{Known Issues of Version 0.9.1 (Beta)}
+ \o \l{Known Issues of Version 0.9.2 (Release Candidate)}
\endlist
*/
@@ -1406,56 +1406,56 @@
\previouspage creator-keyboard-shortcuts.html
\page creator-known-issues.html
- \title Known Issues of Version 0.9.1 (Beta)
+ \title Known Issues of Version 0.9.2 (Release Candidate)
- There are some known issues with Qt Creator 0.9.1 (Beta).
+ There are some known issues with Qt Creator 0.9.2 (Release Candidate).
The development team is aware of those, there is no need to report them as bug.
\list
- \o The central editor sometimes loses it "changed" status marker.
-
- \o There is a kernel bug essentially making debugging unreliable on
- 2.6.24 kernels for i386 (which is, unfortunately, the default on
- Ubuntu 8.04). See
- \l{https://bugs.launchpad.net/ubuntu/+source/gdb/+bug/230315/} for
- details. The only solution to this problem is to boot another
- kernel.
-
- \o Gdb may take long to load debugging symbols, especially from large
- libraries like \c libQtWebKit. Starting the debugging module can
- take up to several minutes without visible progress.
-
- \o Paths or file names containing spaces or special characters, e.g.,
- colons, dollar signs, hash marks etc. may cause difficulties. This
- is because some of the tools Qt Creator uses in the background have
- restrictions on the characters allowed in file and directory names.
- To be on the safe side, we recomment creating projects and project
- items with names consisting of plain characters, numbers,
- underscores, and hyphens.
+ \o Paths or file names containing spaces or special characters, e.g.,
+ colons, dollar signs, hash marks etc. may cause difficulties. This
+ is because some of the tools Qt Creator uses in the background have
+ restrictions on the characters allowed in file and directory names.
+ To be on the safe side, we recomment creating projects and project
+ items with names consisting of plain characters, numbers,
+ underscores, and hyphens.
- \o \c{.pro} files are reformatted if files have been added or removed.
- Whitespace is not preserved.
+ \o \c{.pro} files are reformatted if files have been added or removed.
+ Whitespace is not preserved.
- \o There is no IDE support for adding files to include (\c .pri) files.
+ \o There is no IDE support for adding files to include (\c .pri) files.
- \o There is no IDE support for adding/removing sub-projects. Project
- hierarchies (SUBDIRS template) have to be created manually.
+ \o There is no IDE support for adding/removing sub-projects. Project
+ hierarchies (SUBDIRS template) have to be created manually.
- \o The file system sidebar does not update automatically. As a
- workaround, switch to another directory and then back.
+ \o The file system sidebar does not update automatically. As a
+ workaround, switch to another directory and then back.
- \o Loading KDE4 designer plugins breaks the style, due to a bug in KDE.
+ \o Loading KDE4 designer plugins breaks the style in KDE < 4.2.1
+ due to a bug in KDE.
\o Scopes in .pro files are ignored, and environment variables not expanded.
- \o Code completion for generated UI header files is not updated properly
- after the first time.
+ \o Code completion for generated UI header files is updated only
+ after a build.
+
+ \o Code completion does not support typedefs for nested classes.
+
+ \o There is a kernel bug essentially making debugging unreliable on
+ 2.6.24 kernels for i386 (which is, unfortunately, the default on
+ Ubuntu 8.04). See
+ \l{https://bugs.launchpad.net/ubuntu/+source/gdb/+bug/230315/} for
+ details. The only solution to this problem is to boot another
+ kernel.
+
+ \o Gdb may take long to load debugging symbols, especially from large
+ libraries like \c libQtWebKit. Starting the debugging module can
+ take up to several minutes without visible progress.
- \o Code completion does not support typedefs (e.g. std::string) and
- private classes (e.g. class MyClass::Data {};).
+ \o Setting breakpoints in files that do not have unique absolute
+ paths may fail. For example, remounting parts of a file system
+ using the --bind mount option.
- \o On Gnome, after minimizing Qt Creator and restoring again, the
- application window does not repaint properly until resized.
\endlist
*/
diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
index 08e63b2773e0f7418e90208f451868539eb8fe4c..cc759c6c7ff8a3a49bf1ef8d1635786094666bdb 100644
--- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
@@ -217,7 +217,6 @@ void StackedEditorGroup::addEditor(IEditor *editor)
void StackedEditorGroup::insertEditor(int index, IEditor *editor)
{
- EditorGroup::insertEditor(index, editor);
if (m_container->indexOf(editor->widget()) != -1)
return;
@@ -231,6 +230,9 @@ void StackedEditorGroup::insertEditor(int index, IEditor *editor)
}
connect(editor, SIGNAL(changed()), this, SLOT(checkEditorStatus()));
+ bool block = m_editorList->blockSignals(true);
+ EditorGroup::insertEditor(index, editor);
+ m_editorList->blockSignals(block);
emit editorAdded(editor);
}
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 1f5bb7e1f4efa7f48be94c0a24f0091912827da8..bca1d576e9f4d89979272324f405484dd53c389f 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -599,7 +599,9 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
ty = refTy->elementType();
if (Class *classTy = ty->asClass()) {
- classObjectCandidates.append(classTy);
+ Symbol *symbol = result.second;
+ if (symbol && ! symbol->isClass())
+ classObjectCandidates.append(classTy);
} else if (NamedType *namedTy = ty->asNamedType()) {
// ### This code is pretty slow.
const QList<Symbol *> candidates = context.resolve(namedTy->name());
@@ -700,7 +702,9 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
namedTy = ptrTy->elementType()->asNamedType();
}
} else if (Class *classTy = ty->asClass()) {
- classObjectCandidates.append(classTy);
+ Symbol *symbol = result.second;
+ if (symbol && ! symbol->isClass())
+ classObjectCandidates.append(classTy);
} else {
namedTy = ty->asNamedType();
if (! namedTy) {
diff --git a/src/plugins/designer/workbenchintegration.cpp b/src/plugins/designer/workbenchintegration.cpp
index 6f699b838179db37ef2702cba9ab9764bfb9d957..bb657999ca4c60eb505631b54eeecbd3c12f6e44 100644
--- a/src/plugins/designer/workbenchintegration.cpp
+++ b/src/plugins/designer/workbenchintegration.cpp
@@ -564,7 +564,7 @@ bool WorkbenchIntegration::navigateToSlot(const QString &objectName,
// Find the class definition in the file itself or in the directly
// included files (order 1).
QString namespaceName;
- const Class *cl;
+ const Class *cl = 0;
Document::Ptr doc;
foreach (const Document::Ptr &d, docList) {
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 790edab4571a16fafe2d0d0dcec0b7cf382db88f..c67f976e59c8cbb87d006e794e008d136914ae30 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -1841,7 +1841,8 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct
dirstr = file.left(slsh+1);
file = file.right(file.length() - slsh - 1);
}
- cond = QDir(dirstr).entryList(QStringList(file)).count();
+ if (file.contains('*') || file.contains('?'))
+ cond = QDir(dirstr).entryList(QStringList(file)).count();
break;
}