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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	share/qtcreator/dumper/bridge.py
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/remotelinux/remotelinuxapplicationrunner.cpp

Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
This commit is contained in:
Oswald Buddenhagen
2011-07-07 12:26:59 +02:00
parent fdb0876e9c 600127e875
commit 1f3896e8af
917 changed files with 13037 additions and 6185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -120,7 +120,7 @@ void TypeDescriptionReader::readDocument(UiProgram *ast)
versionString.mid(dotIdx + 1).toInt());
}
if (version > ComponentVersion(1, 1)) {
addError(import->versionToken, "Expected version 1.1 or higher");
addError(import->versionToken, "Expected version 1.1 or lower");
return;
}