Commit 9a1d9770 authored by Olivier Goffart's avatar Olivier Goffart
Browse files

Merge branch 'qmljsinspector'

Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h
parents a66b93d2 9eba87bd
......@@ -72,7 +72,7 @@ doc/pluginhowto/html/*
# Binaries
# --------
bin/*.dll
bin/qtcreator.bin
bin/qtcreator
bin/qtcreator_process_stub*
bin/qtcreator.exe
share/doc/qtcreator/qtcreator.qch
......
......@@ -142,7 +142,7 @@
\row
\o Add a find filter for the find dialog.
\o Implement any kind of search term based search.
\o \l{Find::IFindFilter}, \l{Find::SearchResultWindow}, \l{Find::ResultWindowItem}
\o \l{Find::IFindFilter}, \l{Find::SearchResultWindow}
\row
\o Add support for the find tool bar to a widget.
......
......@@ -5,11 +5,14 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
BatteryIndicator w;
//! [0]
#if defined(Q_WS_S60)
w.showMaximized();
#else
w.show();
#endif
//! [0]
return a.exec();
}
/****************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
//! [0]
otool -L /Developer/Applications/Qt/plugins/designer/libqwt_designer_plugin.dylib
//! [0]
//! [1]
/Developer/Applications/Qt/plugins/designer/libqwt_designer_plugin.dylib:
libqwt_designer_plugin.dylib (compatibility version 0.0.0, current version 0.0.0)
libqwt.5.dylib (compatibility version 5.2.0, current version 5.2.1)
QtDesigner.framework/Versions/4/QtDesigner (compatibility version 4.6.0, current version 4.6.2)
QtScript.framework/Versions/4/QtScript (compatibility version 4.6.0, current version 4.6.2)
QtXml.framework/Versions/4/QtXml (compatibility version 4.6.0, current version 4.6.2)
QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
QtCore.framework/Versions/4/QtCore (compatibility version 4.6.0, current version 4.6.2)
/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 7.9.0)
/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 438.0.0)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 125.0.1)
//! [1]
//! [2]
otool -L /usr/local/qwt-5.2.1/lib/libqwt.5.dylib
//! [2]
//! [3]
/usr/local/qwt-5.2.1/lib/libqwt.5.dylib:
libqwt.5.dylib (compatibility version 5.2.0, current version 5.2.1)
QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
QtCore.framework/Versions/4/QtCore (compatibility version 4.6.0, current version 4.6.2)
/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 7.9.0)
/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 438.0.0)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 125.0.1)
//! [3]
//! [4]
sudo cp /Developer/Applications/Qt/plugins/designer/libqwt_designer_plugin.dylib \
/Developer/Applications/Qt/Qt\ Creator.app/Contents/MacOS/designer
sudo cp -R /usr/local/qwt-5.2.1/lib/* \
/Developer/Applications/Qt/Qt\ Creator.app/Contents/Frameworks/
//! [4]
//! [5]
cd /Developer/Applications/Qt/Qt\ Creator.app/Contents/MacOS/designer
sudo install_name_tool -change
QtCore.framework/Versions/4/QtCore \
@executable_path/../Frameworks/libQtCore.4.dylib \
libqwt_designer_plugin.dylib
sudo install_name_tool -change QtGui.framework/Versions/4/QtGui \
@executable_path/../Frameworks/libQtGui.4.dylib \
libqwt_designer_plugin.dylib
sudo install_name_tool -change QtXml.framework/Versions/4/QtXml \
@executable_path/../Frameworks/libQtXml.4.dylib \
libqwt_designer_plugin.dylib
sudo install_name_tool -change QtScript.framework/Versions/4/QtScript \
@executable_path/../Frameworks/libQtScript.4.dylib \
libqwt_designer_plugin.dylib
sudo install_name_tool -change QtDesigner.framework/Versions/4/QtDesigner \
@executable_path/../Frameworks/libQtDesigner.4.dylib \
libqwt_designer_plugin.dylib
sudo install_name_tool -change libqwt.5.dylib \
@executable_path/../Frameworks/libqwt.5.dylib \
libqwt_designer_plugin.dylib
cd /Developer/Applications/Qt/Qt\ Creator.app/Contents/Frameworks
sudo install_name_tool -change \
QtCore.framework/Versions/4/QtCore \
@executable_path/../Frameworks/libQtCore.4.dylib \
libqwt.5.2.1.dylib
sudo install_name_tool -change \
QtGui.framework/Versions/4/QtGui \
@executable_path/../Frameworks/libQtGui.4.dylib \
libqwt.5.2.1.dylib
//! [5]
doc/images/qtcreator-overview.png

101 KB | W: | H:

doc/images/qtcreator-overview.png

60.6 KB | W: | H:

doc/images/qtcreator-overview.png
doc/images/qtcreator-overview.png
doc/images/qtcreator-overview.png
doc/images/qtcreator-overview.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -32,6 +32,7 @@ extraimages.HTML = qt-logo \
bg_ll_blank.png \
bg_l_blank.png \
breadcrumb.png \
bullet_up.png \
bullet_dn.png \
bullet_gt.png \
bullet_sq.png \
......
......@@ -92,19 +92,12 @@
\o \l{Using the Maemo Emulator}
\o \l{Debugging}
\list
\o \l {Debugging Qt Applications}
\list
\o \l{Debugging the Example Application}
\o \l{Interacting with the Debugger}
\o \l{Setting Up Debugger}
\o \l{Using Debugging Helpers}
\endlist
\o \l{Debugging Qt Quick Applications}
\list
\o \l{Using the QML Inspector}
\endlist
\endlist
\o \l{Using the Maemo Emulator}
\o \l{Using Version Control Systems}
......@@ -551,6 +544,11 @@
an open output pane, click the \gui {Maximize Output Pane} button
or press \key {Alt+9}.
To search within the \gui{Application Output} and \gui{Compile Output}
panes, press \key {Ctrl+F} when the pane is active. Enter search
criteria in the \gui Find field and click the left and right arrows to
search down and up in the pane.
To open the \gui{General Messages} and \gui{Version Control}
panes, select \gui {Window > Output Panes}.
......@@ -824,20 +822,20 @@
\image qtcreator-editortoolbar-symbols.png
Use the toolbar to navigate between open files and symbols in use:
\list
\o To browse forward or backward through your location history, click
Use the toolbar to navigate between open files and symbols in use.
To browse forward or backward through your location history, click
\inlineimage qtcreator-back.png
and \inlineimage qtcreator-forward.png
.
\o To go to any open file, select it from the \gui{Open files}
drop-down menu.
\o To jump to any symbol used in the current file, select it from the
\gui Symbols drop-down menu.
\endlist
When you create or edit forms in a \c{.ui} file, the toolbar contains
Qt Designer specific tools.
To go to any open file, select it from the \gui{Open files} drop-down menu.
Right-click the menu title and select \gui {Copy Full Path to Clipboard} to
copy the path and name of the current file to the clipboard.
To jump to any symbol used in the current file, select it from the
\gui Symbols drop-down menu. By default, the symbols are displayed in the
order in which they appear in the file. Right-click the menu title and select
\gui {Sort Alphabetically} to arrange the symbols in alphabetic order.
\section1 Splitting the Editor View
......@@ -1438,7 +1436,7 @@
\section1 Renaming Symbols
The functions used to rename symbols depends on whether you are
The functions available for renaming symbols depend on whether you are
writing C++ or QML code. For QML, you can only rename IDs.
To rename a specific symbol in a Qt project:
......@@ -1601,6 +1599,8 @@
The wizards prompt you to enter the settings needed
for that particular type of project and create the necessary files for you.
To display other types of files in the \gui Projects pane, specify them in
the project file.
\image qtcreator-new-project.png
......@@ -1637,6 +1637,25 @@
\image qtcreator-new-project-summary.png
\endlist
\section1 Displaying Additional File Types in Projects Pane
Qt Creator determines whether to display files from the project folder
in the \gui Projects pane depending on the file type (.pro, .pri, .cpp,
.h, .ui, .qrc, and so on). To display other types of files, edit the the
project file. Add filenames as values of the \c {OTHER_FILES} variable.
You can also use wildcards.
For example, the following code specifies that text files are displayed
in the \gui Projects pane:
\code
OTHER_FILES += *.txt
\endcode
This also makes the files available in the \gui Locator.
\section1 Adding New Project Wizards
If you have a team working on a large application or several applications,
......@@ -2818,6 +2837,17 @@
\o In the \gui Properties pane, change the \gui objectName to
\bold batteryLevelBar.
\o Right-click the \gui BatteryIndicator object and select
\gui {Lay Out > Lay Out Horizontally} to ensure that the battery
indicator widget size is adjusted correctly on Maemo devices.
To adjust widget size correctly on Qt Simulator, remove the condition
from the main.cpp file (displayed in the following code snippet) and just
leave the \c {w.showMaximized();} line:
\snippet examples/batteryindicator/main.cpp 0
\endlist
\section1 Completing the Header File
......@@ -3222,6 +3252,12 @@
\image qtcreator-textfinder-ui-widgets.png "Adding widgets to Text Finder UI"
\note To easily locate the widgets, use the search box at the top of the
\gui Sidebar. For example, to find the \gui Label widget, start typing
the word \bold label.
\image qtcreator-texfinder-filter.png "Filter field"
\o Double-click the \gui{Label} widget and enter the text \bold{Keyword}.
\o Double-click the \gui{Push Button} widget and enter the text \bold{Find}.
......@@ -3755,7 +3791,7 @@
\section1 Using the Locator Filters
The \gui Locator allows you to browse not only files, but any items
The locator allows you to browse not only files, but any items
defined by \bold{locator filters}. By default, the locator contains
filters which locate:
\list
......@@ -3927,13 +3963,10 @@
\contentspage index.html
\previouspage creator-build-dependencies.html
\page creator-debugging.html
\nextpage creator-debugging-cpp.html
\nextpage creator-debugging-example.html
\title Debugging
You can use the Qt Creator \gui Debug mode to inspect the state of your
Qt and Qt Quick projects while debugging.
Qt Creator does not include a debugger. It provides a debugger plugin that acts
as an interface between the Qt Creator core and external native debuggers
such as the GNU Symbolic Debugger (gdb), the Microsoft Console Debugger (CDB),
......@@ -4155,8 +4188,11 @@
\previouspage creator-debugging.html
\page creator-debugging-cpp.html
\nextpage creator-debugging-example.html
You can use the Qt Creator \gui Debug mode to inspect the state of your
Qt projects while debugging.
\title Debugging Qt Applications
\image qtcreator-debugger-views.png "Native debugger views"
In the \gui Debug mode you can interact with the debugger in several ways, including
the following:
......@@ -4496,7 +4532,7 @@
around as described in the link provided below:
\l http://bugreports.qt.nokia.com/browse/QTBUG-4962.
\endtable
\endtable
\section1 Setting the Symbol Server in Windows
......@@ -4534,12 +4570,14 @@
In \gui Debug mode, you can use several views to interact with the
program you are debugging. Frequently used views are shown by
default and rarely used ones are hidden. To change the default settings,
select \gui Debug > \gui Views, and then select views to display
or hide. You can also lock views. The position of views is saved for future
sessions.
select \gui {Window > Views}, and then select views to display or hide.
\image qtcreator-debugger-views.png "Debug mode views"
By default, the views are locked into place in the workspace. Select
\gui {Window > Views > Locked} to unlock the views. Drag and drop the
views into new positions on the screen. Drag view borders to resize the
views. The size and position of views are saved for future sessions.
\section1 Starting the Debugger
......@@ -4585,6 +4623,14 @@
It is also possible to continue executing the program until the current
function completes or jump to an arbitrary position in the current function.
\section2 Stepping into Frameworks in Mac OS
In Mac OS X, external libraries are usually built into so-called Frameworks,
which may contain both release and debug versions of the library. When you run
applications on the Mac OS desktop, the release version of Frameworks is used
by default. To step into Frameworks, select the \gui {Use debug versions of
Frameworks} option in the project run settings for \gui Desktop and
\gui {Qt Simulator} targets.
\section1 Setting Breakpoints
......@@ -4756,7 +4802,7 @@
/*!
\contentspage index.html
\previouspage creator-debugging-cpp.html
\previouspage creator-debugging.html
\page creator-debugging-example.html
\nextpage creator-debug-mode.html
......@@ -4841,7 +4887,7 @@
\contentspage index.html
\previouspage creator-debugger-engines.html
\page creator-debugging-helpers.html
\nextpage creator-debugging-qml.html
\nextpage creator-maemo-emulator.html
\title Using Debugging Helpers
......@@ -5383,7 +5429,7 @@
\contentspage index.html
\previouspage creator-visual-editor.html
\page quick-projects.html
\nextpage quick-ui.html
\nextpage quick-components.html
\title Creating Qt Quick Projects
......@@ -5421,9 +5467,9 @@
/*!
\contentspage index.html
\previouspage quick-ui.html
\previouspage quick-projects.html
\page quick-components.html
\nextpage quick-buttons.html
\nextpage quick-screens.html
\title Creating Components
......@@ -5462,9 +5508,9 @@
/*!
\contentspage index.html
\previouspage quick-scalable-image.html
\previouspage quick-components.html
\page quick-screens.html
\nextpage quick-list-views.html
\nextpage quick-animations.html
\title Creating Screens
......@@ -5496,7 +5542,7 @@
/*!
\contentspage index.html
\previouspage quick-list-views.html
\previouspage quick-screens.html
\page quick-animations.html
\nextpage quick-user-interaction.html
......@@ -6023,7 +6069,7 @@
/*!
\contentspage index.html
\previouspage creator-qml-inspector.html
\previouspage creator-debugging-helpers.html
\page creator-maemo-emulator.html
\nextpage creator-version-control.html
......@@ -6293,7 +6339,10 @@
which one you use.
The integrated \QD fetches plugins from the \c {%SDK%\bin\designer} folder on Windows
and Linux and \c {QtCreator.app/Contents/MacOS/designer} folder on Mac. To check which plugins
and Linux. For information about how to configure plugins on Mac OS, see
\l{Configuring Qt Designer Plugins on Mac OS}.
To check which plugins
were loaded successfully and which failed, choose \gui{Tools > Form Editor >
About Qt Designer Plugins}.
......@@ -6302,6 +6351,62 @@
\c {%SDK%\qt\plugins\designer}. To check which plugins were loaded successfully and which
failed, choose \gui{Help > About Plugins}.
\section2 Configuring Qt Designer Plugins on Mac OS
On the Mac, a GUI application must be built and run from a bundle. A bundle is a
directory structure that appears as a single entity when viewed in the Finder.
A bundle for an application typcially contains the executable and all the resources
it needs.
Qt Creator uses its own set of Qt Libraries located in the bundle, and therefore,
you need to configure the \QD plugins that you want to use with Qt Creator.
Fore more information about how to deploy applications on Mac OS, see
\l{http://doc.qt.nokia.com/4.6/deployment-mac.html}{Deploying an Application on Mac OS X}.
The following example illustrates how to configure version 5.2.1 of the
\l{http://qwt.sourceforge.net/}{Qwt - Qt Widgets for Technical Applications} library
for use with Qt Creator:
\list 1
\o To check the paths used in the Qwt library, enter the following \c otool command:
\snippet examples/doc_src_plugins.qdoc 0
The output for Qwt 5.2.1 indicates that the plugin uses Qt core libraries (QtDesigner,
QtScript, QtXml, QtGui and QtCore) and libqwt.5.dylib:
\snippet examples/doc_src_plugins.qdoc 1
\o You must copy the \QD plugin and the Qwt library files to the following locations:
\list
\o \c {libqwt_designer_plugin.dylib} to \c {QtCreator.app/Contents/MacOS/designer}
\o \c {libqwt.*.dylib} to \c {QtCreator.app/Contents/Frameworks}
\endlist
Enter the following commands:
\snippet examples/doc_src_plugins.qdoc 4
\o Enter the following \c otool command to check the libraries that are used by the
Qwt library:
\snippet examples/doc_src_plugins.qdoc 2
The command returns the following output:
\snippet examples/doc_src_plugins.qdoc 3
\o Enter the following \c install_name_tool command to fix the references of the
libraries:
\snippet examples/doc_src_plugins.qdoc 5
\endlist
\section1 Matching Build Keys
The Qt Creator that is included in pre-built SDK packages on Windows is built with the
......@@ -6419,7 +6524,7 @@
\title Tips and Tricks
\section1 Switching between modes
\section1 Switching Between Modes
Qt Creator uses different modes for different purposes. You can quickly
switch between these modes with the following keyboard shortcuts:
......@@ -6442,6 +6547,12 @@
To quickly move between currently open files, press
\key Ctrl+Tab.
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). For example, if you use the \gui Locator
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}.
\section1 Moving To the Edit Mode
......@@ -6459,10 +6570,34 @@
To find specific settings you require in \gui{Tools} > \gui{Options...}
use the filter located at the top left of the \gui Options dialog box.
\section1 Opening Output Panes
The output panes provide a list of errors and warnings encountered during
a build, detailed output from the compiler, status of a program when it is
executed and debug output, as well as search results.
To open output panes, use the following shortcuts:
\list
\o \gui{Build Issues} pane Alt+1 (Cmd+1 on Mac OS X)
\o \gui{Search Results} pane Alt+2 (Cmd+2 on Mac OS X)
\o \gui{Application Output} pane Alt+3 (Cmd+3 on Mac OS X)
\o \gui{Compile Output} pane Alt+4 (Cmd+4 on Mac OS X)
\endlist
For more information about output panes, see \l{Viewing Output}.
\section1 Using Keyboard Shortcuts
Qt Creator provides \l{Keyboard Shortcuts}{many useful keyboard shortcuts}.
You can see the keyboard shortcut for a menu command in the menu
or the tooltip for a button.
To customize, import or export keyboard shortcuts, select \gui Tools >
\gui Options... > \gui Environment > \gui Keyboard.
......@@ -6497,11 +6632,19 @@
\section1 Moving To Symbols
To move straight to a symbol used in a project, select the symbol in the
\gui Editor toolbar drop-down menu.
For more information on the editor toolbar,
\gui Editor toolbar drop-down menu. For more information on the editor toolbar,
see \l {Using the Editor Toolbar}.
To jump to a symbol in the current file, press \key {Ctrl+K} to open the
\gui Locator, enter a period (.), and start typing the symbol name. Then
select the symbol in the list. For more information on using the locator,
see \l{Searching With the Locator}.
Press \key Ctrl (\key Cmd on Mac OS) and click a symbol to move directly to
the definition or the declaration of the symbol. You can also move the cursor
on the symbol and press \key {F2}. For more information, see
\l{Moving to Symbol Definition or Declaration}.
\section1 Displaying Signals and Slots
......@@ -6515,6 +6658,9 @@
the slot in the \e slots subitem. The objects connected to this slot are
shown as children of the slot. This method works with signals too.
For more information about the \gui{Locals and Watchers} view, see
\l{Locals and Watchers}.
\section1 Displaying Low Level Data
......@@ -6529,6 +6675,19 @@
\o Uncheck the \gui{Use debugging helper} checkbox.
\endlist
\section1 Locating Files
The \gui Locator provides one of the easiest ways in Qt Creator to browse
through projects, files, classes, methods, documentation and file systems.
To quickly access files not directly mentioned in your project, you can
create your own locator filters. That way you can locate files in a
directory structure you have defined.
To create locator filters, select \gui {Tools > Options... > Locator > Add}.
For more information, see \l{Creating Locator Filters}.
*/
......