Commit b59fa0cd authored by hjk's avatar hjk
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h
parents 088e5fd5 ffdd4110
The QtCreator 2.1 release contains bug fixes and new features.
The QtCreator 2.0.1 release contains mainly bug fixes on top of 2.0
Below is a list of relevant changes. You can find a complete list of changes
within the logs of Qt Creator's sources. Simply check it out from the public git
repository e.g.,
git clone git://gitorious.org/qt-creator/qt-creator.git
git log --cherry-pick --pretty=oneline v2.0.0...v2.1.0
git log --cherry-pick --pretty=oneline v2.0.0...v2.0.1
General
* Fix the suggested path in the new dialog in case of sub projects
* Search dialog now opens the completion box for the search term on cursor down
* Fix Mercurial plugin (QTCREATORBUG-1503)
Editing
* FakeVim: Fix issues with non-letter keys on non-US keyboards
......@@ -30,12 +31,6 @@ Debugging
* Fix that the newest version of compiled debugging helper was not used
if there was an older version still was around in a different search path
QML/JS Support
* New QmlDesigner
* Allows visual manipulation of .qml files
* Supports changing top-level states
* Integrates tighly with text editor, e.g. shared history, navigation facilities ...
Platform Specific
Mac
......@@ -44,6 +39,7 @@ Linux (GNOME and KDE)
Windows
* Fixed that some menu items got disabled during keyboard navigation
* Detect Microsoft Visual Studio 2010
Additional credits go to:
Mac:
DYLD_IMAGE_SUFFIX does not work on Mac OS X Snow Leopard. So don't use the
corresponding setting in the Projects tab.
See: http://wimleers.com/blog/dyld-image-suffix-causing-havoc-on-mac-os-x-snow-leopard
A possible workaround is:
sudo mv /usr/lib/libSystem.B_debug.dylib /usr/lib/libSystem.B_debug.dylib.backup
sudo cp /usr/lib/libSystem.B.dylib /usr/lib/libSystem.B_debug.dylib.backup
......@@ -19,14 +19,13 @@ HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
$$PWD/addressbook-sdk.qdoc \
$$PWD/qt-defines.qdocconf \
$$PWD/qt-html-templates.qdocconf \
$$PWD/qtcreator.qdocconf \
$$PWD/qtcreator-online.qdocconf
$$PWD/qtcreator.qdocconf
html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf
html_docs.commands = $$QDOC -creator $$PWD/qtcreator.qdocconf
html_docs.depends += $$HELP_DEP_FILES
html_docs.files = $$QHP_FILE
html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf
html_docs_online.commands = $$QDOC -online $$PWD/qtcreator.qdocconf
html_docs_online.depends += $$HELP_DEP_FILES
qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
......
doc/templates/images/bg_l.png

139 Bytes | W: | H:

doc/templates/images/bg_l.png

100 Bytes | W: | H:

doc/templates/images/bg_l.png
doc/templates/images/bg_l.png
doc/templates/images/bg_l.png
doc/templates/images/bg_l.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bg_l_blank.png

123 Bytes | W: | H:

doc/templates/images/bg_l_blank.png

84 Bytes | W: | H:

doc/templates/images/bg_l_blank.png
doc/templates/images/bg_l_blank.png
doc/templates/images/bg_l_blank.png
doc/templates/images/bg_l_blank.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bg_r.png

136 Bytes | W: | H:

doc/templates/images/bg_r.png

96 Bytes | W: | H:

doc/templates/images/bg_r.png
doc/templates/images/bg_r.png
doc/templates/images/bg_r.png
doc/templates/images/bg_r.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/box_bg.png

129 Bytes | W: | H:

doc/templates/images/box_bg.png

89 Bytes | W: | H:

doc/templates/images/box_bg.png
doc/templates/images/box_bg.png
doc/templates/images/box_bg.png
doc/templates/images/box_bg.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/breadcrumb.png

195 Bytes | W: | H:

doc/templates/images/breadcrumb.png

134 Bytes | W: | H:

doc/templates/images/breadcrumb.png
doc/templates/images/breadcrumb.png
doc/templates/images/breadcrumb.png
doc/templates/images/breadcrumb.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bullet_gt.png

185 Bytes | W: | H:

doc/templates/images/bullet_gt.png

124 Bytes | W: | H:

doc/templates/images/bullet_gt.png
doc/templates/images/bullet_gt.png
doc/templates/images/bullet_gt.png
doc/templates/images/bullet_gt.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bullet_sq.png

117 Bytes | W: | H:

doc/templates/images/bullet_sq.png

74 Bytes | W: | H:

doc/templates/images/bullet_sq.png
doc/templates/images/bullet_sq.png
doc/templates/images/bullet_sq.png
doc/templates/images/bullet_sq.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/bullet_up.png

253 Bytes | W: | H:

doc/templates/images/bullet_up.png

210 Bytes | W: | H:

doc/templates/images/bullet_up.png
doc/templates/images/bullet_up.png
doc/templates/images/bullet_up.png
doc/templates/images/bullet_up.png
  • 2-up
  • Swipe
  • Onion skin
doc/templates/images/page_bg.png

126 Bytes | W: | H:

doc/templates/images/page_bg.png

84 Bytes | W: | H:

doc/templates/images/page_bg.png
doc/templates/images/page_bg.png
doc/templates/images/page_bg.png
doc/templates/images/page_bg.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -63,11 +63,9 @@ function processNokiaData(response){
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
lookupCount++;
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
$('#ul001').append(full_li_element);
$('#ul001 .defaultLink').css('display','none');
......@@ -77,7 +75,6 @@ function processNokiaData(response){
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
articleCount++;
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
......@@ -103,10 +100,13 @@ function processNokiaData(response){
if(i==propertyTags.length){$('#pageType').removeClass('loading');}
}
if(lookupCount > 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult hit\">Found ' + lookupCount + ' hits</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
if(articleCount > 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul002 li').css('display','block');}
if(exampleCount > 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult hit\">Found ' + articleCount + ' hits</li>');$('#ul003 li').css('display','block');}
if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
if(lookupCount == 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
if(articleCount == 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
if(exampleCount == 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('<li class=\"menuAlert liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
// reset count variables;
lookupCount=0;
articleCount = 0;
......@@ -121,6 +121,7 @@ function CheckEmptyAndLoadList()
var pageVal = $('title').html();
$('#feedUrl').remove();
$('#pageVal').remove();
$('.menuAlert').remove();
$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
$('.liveResult').remove();
......@@ -160,7 +161,8 @@ else
var searchString = $('#pageType').val() ;
if ((searchString == null) || (searchString.length < 3)) {
$('#pageType').removeClass('loading');
$('.liveResult').remove(); // replaces removeResults();
$('.liveResult').remove();
$('.searching').remove();
CheckEmptyAndLoadList();
$('.report').remove();
// debug$('.content').prepend('<li>too short or blank</li>'); // debug
......@@ -169,9 +171,8 @@ else
if (this.timer) clearTimeout(this.timer);
this.timer = setTimeout(function () {
$('#pageType').addClass('loading');
// debug$('.content').prepend('<li>new search started </li>');// debug
// debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug
$('.searching').remove();
$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
$.ajax({
contentType: "application/x-www-form-urlencoded",
url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
......@@ -180,9 +181,10 @@ else
type: 'post',
success: function (response, textStatus) {
$('.liveResult').remove(); // replaces removeResults();
$('#pageType').removeClass('loading');
$('.liveResult').remove();
$('.searching').remove();
$('#pageType').removeClass('loading');
$('.list ul').prepend('<li class="menuAlert searching">Searching...</li>');
processNokiaData(response);
}
......
......@@ -59,9 +59,20 @@ var narrowInit = function() {
}
$(document).ready(function(){
if ($('body').hasClass('narrow')) {
/* if ($('body').hasClass('narrow')) {
narrowInit();
}
*/
if($(window).width()<600) {
$('body').addClass('narrow');
if ($("#narrowsearch").length == 0) {
narrowInit();
}
}
else {
$('body').removeClass('narrow');
}
});
$(window).bind('resize', function () {
......
......@@ -15,7 +15,12 @@
}
.narrow .footer {
margin: 0;
margin: 0px;
}
.creator .header, .creator .header .content, .creator .footer, .creator .wrapper {
margin: 0px;
min-width: 300px;
}
.narrow .header
{
......@@ -49,7 +54,7 @@
.narrow .header .qtref a
{
color: #363534;
color: #00732F;
}
.narrow .header .qtref span
......@@ -98,7 +103,7 @@
}
.narrow .header #shortCut ul li a
{
color: #44a51c;
color: #00732F;
}
.narrow .wrapper .hd
......@@ -126,6 +131,11 @@
margin: 0 5px 0 5px;
}
.creator .wrap
{
margin: 0px;
background:#FFFFFF;
}
.narrow .wrap .toolbar
{
border-bottom: none;
......@@ -135,7 +145,14 @@
{
padding-top: 15px;
}
.creator .wrap .content
{
padding-top: 10px;
}
.creator .wrap .content .guide
{
padding-top: 15px;
}
.narrow .wrap .feedback
{
display: none;
......
This diff is collapsed.
......@@ -831,9 +831,9 @@ def extractFields(type):
type = stripTypedefs(type)
#warn("TYPE 1: %s" % type)
# This fails for arrays. See comment in lookupType.
type2 = lookupType(str(type))
if not type2 is None:
type = type2
type0 = lookupType(str(type))
if not type0 is None:
type = type0
#warn("TYPE 2: %s" % type)
fields = type.fields()
#warn("FIELDS: %s" % fields)
......@@ -863,7 +863,6 @@ class Item:
# This is a mapping from 'type name' to 'display alternatives'.
qqDumpers = {}
qqFormats = {}
qqNs = ""
......
......@@ -631,7 +631,6 @@ def qdump__QObject(d, item):
d.putNumChild(4)
if d.isExpanded(item):
with Children(d):
d.putFields(item)
# Parent and children.
if stripClassTag(str(item.value.type)) == d.ns + "QObject":
d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))
......
......@@ -5147,12 +5147,6 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<source>The generated header of the form &apos;%1&apos; could not be found.
Rebuilding the project might help.</source>
<translation type="obsolete">找不到界面 &quot;%1&quot;生成的头文件。
重新构建工程可能有帮助。</translation>
</message>
<message>
<source>The generated header of the form &apos;%1&apos; could not be found.
Rebuilding the project might help.</source>
<translation>找不到界面 &quot;%1&quot;生成的头文件。
重新构建工程可能有帮助。</translation>
......
......@@ -143,13 +143,15 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
Core::ActionContainer *menuQtQuick = am->createMenu(Constants::M_QTQUICK);
menuQtQuick->menu()->setTitle(tr("Qt Quick"));
mtools->addMenu(menuQtQuick);
m_actionPreview = new QAction("&Preview", this);
m_actionPreview = new QAction(tr("&Preview"), this);
Core::Context toolsMenuContext(QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU);
Core::Command *cmd = addToolAction(m_actionPreview, am, toolsMenuContext,
QLatin1String("QtQuick.Preview"), menuQtQuick, tr("Ctrl+Alt+R"));
connect(cmd->action(), SIGNAL(triggered()), SLOT(openPreview()));
m_previewRunner = new QmlJSPreviewRunner(this);
m_actionPreview->setEnabled(m_previewRunner->isReady());
QAction *followSymbolUnderCursorAction = new QAction(tr("Follow Symbol Under Cursor"), this);
cmd = am->registerAction(followSymbolUnderCursorAction, Constants::FOLLOW_SYMBOL_UNDER_CURSOR, context);
......
......@@ -18,12 +18,16 @@ QmlJSPreviewRunner::QmlJSPreviewRunner(QObject *parent) :
const QString searchPath = QCoreApplication::applicationDirPath()
+ Utils::SynchronousProcess::pathSeparator()
+ QString(qgetenv("PATH"));
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qml"));
m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer"));
ProjectExplorer::Environment environment = ProjectExplorer::Environment::systemEnvironment();
m_applicationLauncher.setEnvironment(environment.toStringList());
}
bool QmlJSPreviewRunner::isReady() const
{
return !m_qmlViewerDefaultPath.isEmpty();
}
void QmlJSPreviewRunner::run(const QString &filename)
{
......
......@@ -13,6 +13,8 @@ class QmlJSPreviewRunner : public QObject
Q_OBJECT
public:
explicit QmlJSPreviewRunner(QObject *parent = 0);
bool isReady() const;
void run(const QString &filename);
signals:
......
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