feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.7'

Browse Source 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
This commit is contained in:
Oswald Buddenhagen
2013-05-15 10:21:47 +02:00
parent c6bee7e20e 8ca5b55a0b
commit 6fb94a7b10
63 changed files with 883 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/cplusplus/cxx11/tst_cxx11.cpp
View File

@@ -175,7 +175,7 @@ void tst_cxx11::inlineNamespaceLookup()
snapshot.insert(doc);
LookupContext context(doc, snapshot);
QSharedPointer<Control> control = context.control();
QSharedPointer<Control> control = context.bindings()->control();
QList<LookupItem> results = context.lookup(control->identifier("foo"), doc->globalNamespace());
QCOMPARE(results.size(), 1); // the symbol is visible from the global scope