Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • tohunger/qt-creator
1 result
Select Git revision
Loading items
Show changes

Commits on Source 41

Expand all Show whitespace changes
Inline Side-by-side
Showing
with 10645 additions and 12687 deletions
README
View file @ 9cf61af1
Qt Creator 2.1.0 Qt Creator 2.0.81
=============== ===============
Qt Creator is a crossplatform C++ IDE for development with the Qt framework. Qt Creator is a crossplatform C++ IDE for development with the Qt framework.
......
doc/qt-html-templates.qdocconf
View file @ 9cf61af1
...@@ -27,7 +27,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ ...@@ -27,7 +27,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" </div>\n" \ " </div>\n" \
" <div id=\"shortCut\">\n" \ " <div id=\"shortCut\">\n" \
" <ul>\n" \ " <ul>\n" \
" <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 2.1.0 </a></span></li>\n" \ " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 2.0.81 </a></span></li>\n" \
" <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \ " <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
" </a></li>\n" \ " </a></li>\n" \
" </ul>\n" \ " </ul>\n" \
......
doc/qtcreator.qdoc
View file @ 9cf61af1
...@@ -270,26 +270,15 @@ ...@@ -270,26 +270,15 @@
\section1 Debuggers \section1 Debuggers
Qt Creator does not include a debugger. It provides a debugger plugin that acts Qt Creator provides means to help you with debugging your application.
as an interface between the Qt Creator core and external native debuggers: It interfaces the GNU Symbolic Debugger (gdb) and the Microsoft Console
Debugger (CDB) to debug native C++ applications and an internal debugger
\list for Java Script. This includes the ability to connect mobile devices to
your development PC and debug applications running on the devices.
\o GNU Symbolic Debugger (gdb)
\o Microsoft Console Debugger (CDB)
\o internal Java Script debugger
\endlist
Qt Creator displays the raw information provided by the native debuggers Qt Creator displays the raw information provided by the native debuggers
in a clear and concise manner with the goal to simplify the debugging process in a clear and concise manner with the goal to simplify the debugging process
as much as possible without losing the power of the native debuggers. as much as possible without losing the power of the native debuggers.
You can use the native debuggers to debug the C++ language.
You can connect mobile devices to your development PC and debug processes
running on the devices.
*/ */
...@@ -6268,7 +6257,7 @@ ...@@ -6268,7 +6257,7 @@
To move forward in the location history, press \key {Alt+Right} To move forward in the location history, press \key {Alt+Right}
(\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left} (\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left}
(\key {Cmd+Opt+Right} on Mac OS). For example, if you use the \gui Locator (\key {Cmd+Opt+Left} on Mac OS). For example, if you use the \gui Locator
to jump to a symbol in the same file, you can jump back to your original to jump to a symbol in the same file, you can jump back to your original
location in that file by pressing \key {Alt+Left}. location in that file by pressing \key {Alt+Left}.
......
doc/qtcreator.qdocconf
View file @ 9cf61af1
...@@ -19,12 +19,12 @@ sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc" ...@@ -19,12 +19,12 @@ sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc"
qhp.projects = QtCreator qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.210 qhp.QtCreator.namespace = com.nokia.qtcreator.2081
qhp.QtCreator.virtualFolder = doc qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.filterAttributes = qtcreator 2.1.0 qhp.QtCreator.filterAttributes = qtcreator 2.0.81
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.1.0 qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.81
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.1.0 qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.81
qhp.QtCreator.indexRoot = qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = \ qhp.QtCreator.extraFiles = \
style/style.css \ style/style.css \
......
share/qtcreator/gdbmacros/dumper.py
View file @ 9cf61af1
...@@ -257,6 +257,7 @@ class SubItem: ...@@ -257,6 +257,7 @@ class SubItem:
class Children: class Children:
def __init__(self, d, numChild = 1, childType = None, childNumChild = None): def __init__(self, d, numChild = 1, childType = None, childNumChild = None):
# Note: childNumChild == 0 does not work.
self.d = d self.d = d
self.numChild = numChild self.numChild = numChild
self.childType = childType self.childType = childType
...@@ -613,7 +614,7 @@ movableTypes = set([ ...@@ -613,7 +614,7 @@ movableTypes = set([
"QFileInfo", "QFixed", "QFixedPoint", "QFixedSize", "QFileInfo", "QFixed", "QFixedPoint", "QFixedSize",
"QHashDummyValue", "QHashDummyValue",
"QIcon", "QImage", "QIcon", "QImage",
"QLine", "QLineF", "QLatin1Char", "QLocal", "QLine", "QLineF", "QLatin1Char", "QLocale",
"QMatrix", "QModelIndex", "QMatrix", "QModelIndex",
"QPoint", "QPointF", "QPen", "QPersistentModelIndex", "QPoint", "QPointF", "QPen", "QPersistentModelIndex",
"QResourceRoot", "QRect", "QRectF", "QRegExp", "QResourceRoot", "QRect", "QRectF", "QRegExp",
...@@ -1326,6 +1327,9 @@ class Dumper: ...@@ -1326,6 +1327,9 @@ class Dumper:
nsStrippedType = self.stripNamespaceFromType( nsStrippedType = self.stripNamespaceFromType(
typedefStrippedType).replace("::", "__") typedefStrippedType).replace("::", "__")
# Is this derived from QObject?
hasMetaObject = False
#warn(" STRIPPED: %s" % nsStrippedType) #warn(" STRIPPED: %s" % nsStrippedType)
#warn(" DUMPERS: %s" % self.dumpers) #warn(" DUMPERS: %s" % self.dumpers)
#warn(" DUMPERS: %s" % (nsStrippedType in self.dumpers)) #warn(" DUMPERS: %s" % (nsStrippedType in self.dumpers))
......
share/qtcreator/gdbmacros/gdbmacros.py
View file @ 9cf61af1
...@@ -485,15 +485,15 @@ def qdump__QLocale(d, item): ...@@ -485,15 +485,15 @@ def qdump__QLocale(d, item):
d.putStringValue(call(item.value, "name()")) d.putStringValue(call(item.value, "name()"))
d.putNumChild(8) d.putNumChild(8)
if d.isExpanded(item): if d.isExpanded(item):
with Children(d, 1, lookupType(d.ns + "QChar"), 0): with Children(d, 1, lookupType(d.ns + "QChar")):
d.putCallItem("country", item, "country()") d.putCallItem("country", item, "country()")
d.putCallItem("language", item, "language()") d.putCallItem("language", item, "language()")
d.putCallItem("measurementSystem", item, "measurementSystem()") d.putCallItem("measurementSystem", item, "measurementSystem()")
d.putCallItem("numberOptions", item, "numberOptions()") d.putCallItem("numberOptions", item, "numberOptions()")
d.putCallItem("timeFormat_(short)", item, d.putCallItem("timeFormat_(short)", item,
"timeFormat(" + d.ns + "QLocale::ShortFormat)") "timeFormat('" + d.ns + "QLocale::ShortFormat')")
d.putCallItem("timeFormat_(long)", item, d.putCallItem("timeFormat_(long)", item,
"timeFormat(" + d.ns + "QLocale::LongFormat)") "timeFormat('" + d.ns + "QLocale::LongFormat')")
d.putCallItem("decimalPoint", item, "decimalPoint()") d.putCallItem("decimalPoint", item, "decimalPoint()")
d.putCallItem("exponential", item, "exponential()") d.putCallItem("exponential", item, "exponential()")
d.putCallItem("percent", item, "percent()") d.putCallItem("percent", item, "percent()")
...@@ -578,9 +578,6 @@ def extractCString(table, offset): ...@@ -578,9 +578,6 @@ def extractCString(table, offset):
return result return result
def qdump__QWidget(d, item):
qdump__QObject(d, item)
def qdump__QObject(d, item): def qdump__QObject(d, item):
#warn("OBJECT: %s " % item.value) #warn("OBJECT: %s " % item.value)
staticMetaObject = item.value["staticMetaObject"] staticMetaObject = item.value["staticMetaObject"]
...@@ -623,9 +620,8 @@ def qdump__QObject(d, item): ...@@ -623,9 +620,8 @@ def qdump__QObject(d, item):
# Properties. # Properties.
with SubItem(d): with SubItem(d):
#propertyCount = metaData[6] propertyCount = metaData[6]
# FIXME: Replace with plain memory accesses. #propertyCount = call(mo, "propertyCount()")
propertyCount = call(mo, "propertyCount()")
#warn("PROPERTY COUNT: %s" % propertyCount) #warn("PROPERTY COUNT: %s" % propertyCount)
propertyData = metaData[7] propertyData = metaData[7]
d.putName("properties") d.putName("properties")
...@@ -1811,6 +1807,8 @@ def qdump__std__set(d, item): ...@@ -1811,6 +1807,8 @@ def qdump__std__set(d, item):
def qdump__std__string(d, item): def qdump__std__string(d, item):
data = item.value["_M_dataplus"]["_M_p"] data = item.value["_M_dataplus"]["_M_p"]
baseType = item.value.type.unqualified().strip_typedefs() baseType = item.value.type.unqualified().strip_typedefs()
if baseType.code == gdb.TYPE_CODE_REF:
baseType = baseType.target().unqualified().strip_typedefs()
charType = baseType.template_argument(0) charType = baseType.template_argument(0)
repType = lookupType("%s::_Rep" % baseType).pointer() repType = lookupType("%s::_Rep" % baseType).pointer()
rep = (data.cast(repType) - 1).dereference() rep = (data.cast(repType) - 1).dereference()
...@@ -1857,9 +1855,20 @@ def qdump__std__string(d, item): ...@@ -1857,9 +1855,20 @@ def qdump__std__string(d, item):
def qdump__std__vector(d, item): def qdump__std__vector(d, item):
impl = item.value["_M_impl"] impl = item.value["_M_impl"]
type = item.value.type.template_argument(0)
alloc = impl["_M_end_of_storage"]
isBool = str(type) == 'bool'
if isBool:
start = impl["_M_start"]["_M_p"]
finish = impl["_M_finish"]["_M_p"]
# FIXME: 32 is sizeof(unsigned long) * CHAR_BIT
storagesize = 32
size = (finish - start) * storagesize
size += impl["_M_finish"]["_M_offset"]
size -= impl["_M_start"]["_M_offset"]
else:
start = impl["_M_start"] start = impl["_M_start"]
finish = impl["_M_finish"] finish = impl["_M_finish"]
alloc = impl["_M_end_of_storage"]
size = finish - start size = finish - start
check(0 <= size and size <= 1000 * 1000 * 1000) check(0 <= size and size <= 1000 * 1000 * 1000)
...@@ -1871,7 +1880,14 @@ def qdump__std__vector(d, item): ...@@ -1871,7 +1880,14 @@ def qdump__std__vector(d, item):
d.putItemCount(size) d.putItemCount(size)
d.putNumChild(size) d.putNumChild(size)
if d.isExpanded(item): if d.isExpanded(item):
with Children(d, [size, 10000], item.value.type.template_argument(0)): if isBool:
with Children(d, [size, 10000], type):
for i in d.childRange():
q = start + i / storagesize
data = (q.dereference() >> (i % storagesize)) & 1
d.putBoolItem(str(i), select(data, "true", "false"))
else:
with Children(d, [size, 10000], type):
p = start p = start
for i in d.childRange(): for i in d.childRange():
d.putItem(Item(p.dereference(), item.iname, i)) d.putItem(Item(p.dereference(), item.iname, i))
......
share/qtcreator/templates/wizards/qml-runtime/wizard.xml → share/qtcreator/templates/wizards/qml-extension/wizard.xml
View file @ 9cf61af1
...@@ -36,11 +36,11 @@ leave room for the Qt 4 target page. ...@@ -36,11 +36,11 @@ leave room for the Qt 4 target page.
--> -->
<wizard version="1" kind="project" <wizard version="1" kind="project"
class="qt4project" firstpage="10" class="qt4project" firstpage="10"
id="QmlRuntimePlugin" category="F.Projects"> id="QmlExtensionPlugin" category="F.Projects">
<icon>lib.png</icon> <icon>lib.png</icon>
<description>Creates a C++ plugin to extend the funtionality of the QML runtime.</description> <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</description>
<displayname>QML Runtime Plug-in</displayname> <displayname>Custom QML Extension Plugin</displayname>
<displaycategory>QML Runtime Plug-in</displaycategory> <displaycategory>QML Extension Plugin</displaycategory>
<files> <files>
<file source="qmldir" target="qmldir"/> <file source="qmldir" target="qmldir"/>
<file source="plugin.h" target="%ProjectName%.h"/> <file source="plugin.h" target="%ProjectName%.h"/>
...@@ -50,7 +50,7 @@ leave room for the Qt 4 target page. ...@@ -50,7 +50,7 @@ leave room for the Qt 4 target page.
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/> <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
</files> </files>
<!-- Create a 2nd wizard page with parameters --> <!-- Create a 2nd wizard page with parameters -->
<fieldpagetitle>QML Runtime Plug-in Parameters</fieldpagetitle> <fieldpagetitle>Custom QML Extension Plugin Parameters</fieldpagetitle>
<fields> <fields>
<field mandatory="false" name="ObjectName"> <field mandatory="false" name="ObjectName">
<fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9_]+$' defaulttext="ExampleObject"/> <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9_]+$' defaulttext="ExampleObject"/>
......
share/qtcreator/translations/qtcreator_fr.ts
View file @ 9cf61af1
...@@ -6410,7 +6410,7 @@ Vous pouvez décider entre attendre plus longtemps ou mettre fin au débogage.</ ...@@ -6410,7 +6410,7 @@ Vous pouvez décider entre attendre plus longtemps ou mettre fin au débogage.</
</message> </message>
<message> <message>
<location filename="../../../src/plugins/designer/codemodelhelpers.cpp" line="+129"/> <location filename="../../../src/plugins/designer/codemodelhelpers.cpp" line="+129"/>
<source>The generated header of the form &apos;%1&apos; could be found. <source>The generated header of the form &apos;%1&apos; could not be found.
Rebuilding the project might help.</source> Rebuilding the project might help.</source>
<translation type="unfinished">Impossible de trouver un en-tête généré pour l&apos;interface graphique %1. <translation type="unfinished">Impossible de trouver un en-tête généré pour l&apos;interface graphique %1.
Regénérer le projet peut résoudre ce problème.</translation> Regénérer le projet peut résoudre ce problème.</translation>
......
share/qtcreator/translations/qtcreator_pl.ts
View file @ 9cf61af1
...@@ -9113,7 +9113,7 @@ Zaleca się użycie gdb wersji 7.1 lub późniejszej.</translation> ...@@ -9113,7 +9113,7 @@ Zaleca się użycie gdb wersji 7.1 lub późniejszej.</translation>
</message> </message>
<message> <message>
<location filename="../../../src/plugins/designer/codemodelhelpers.cpp" line="+129"/> <location filename="../../../src/plugins/designer/codemodelhelpers.cpp" line="+129"/>
<source>The generated header of the form &apos;%1&apos; could be found. <source>The generated header of the form &apos;%1&apos; could not be found.
Rebuilding the project might help.</source> Rebuilding the project might help.</source>
<translation>Nie można odnaleźć wygenerowanego pliku nagłówkowego dla formularza &quot;%1&quot;. <translation>Nie można odnaleźć wygenerowanego pliku nagłówkowego dla formularza &quot;%1&quot;.
Spróbuj ponownie przebudować projekt.</translation> Spróbuj ponownie przebudować projekt.</translation>
......