| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
It's so much nicer for the qml profiler to know the actual sizes of
images ...
Change-Id: Ib1c0d38b002a061e7cffe2619034e144e4d5f2cf
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
| |
Change-Id: Ia3b26c60193b994571cd3b7fbbf8346ddeca46ea
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Denoise usages
get{Short|Long}PathName are now static. They're not used anywhere except
in normalizePathName.
Change-Id: Ief277b6d828faadd98ec7faa39dd682bfaa8805f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
The getting started page is not part redesign, anymore.
Change-Id: Iec779d4fcf86f1800e17a5b7775698b64ce16555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
| |
This ports the welcome screen to use QtQuick 2.0.
I have disabled the plugin on Qt4 builds.
Change-Id: Ia921d0747c8f7d4441c88fc9fb77b822496091f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
|
|
|
|
|
|
| |
* fixes Keep and Open dialog option
* does nothing if user closes the dialog window
Change-Id: I3e84621e8314450c4dca2408ae2738ebcd1b33e6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|
|
|
|
| |
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change
* Removes IMode::type, ModeManager::activateModeType, and
IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
instead
* Adapts the mode switching code in EditorManager to handle multiple
windows, for example switching to edit mode should only happen if
the editor/view is in the main window. Otherwise the editor window
should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
make the current editor visible by default, introducing
DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
used
One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.
Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|
|
|
|
|
|
|
| |
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.
Change-Id: Iac7e32b861d60c4c386f64f065d05a1856e396cf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
|
|
|
|
|
|
|
|
| |
Somehow AbstractItemModel is not registered in Qt 4.
So we cannot use the qtVersionModel as a property.
Change-Id: Iac822998cb660d317e2b750dde9f3207c66f5feb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\ |
|
| |
| |
| |
| |
| | |
Change-Id: I85df68b4ee1ee4d37b77a34ff8f7bce65d24dc0d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
|
| |
| |
| |
| |
| | |
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/coreplugin/editormanager/openeditorsview.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlinspectoradapter.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/welcome/welcomeplugin.cpp
Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Work around QTBUG-17529 by normalizing paths first.
Task-number: QTCREATORBUG-6126
Task-number: QTBUG-28230
Change-Id: Ib7a52c81cf546d022b9db8402e225c8d3c10c0ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Iabf3c96fc6d6b17282ec2ad43f32f76b04ac2ef0
Reviewed-by: hjk <qthjk@ovi.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessageloghandler.h
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/madde/maemodeployconfigurationwidget.h
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentinfo.h
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/ichecklib_global.h
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
tests/manual/ssh/tunnel/tunnel.h
Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
|
| |
| |
| |
| |
| | |
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
This use case is deprecated in Qt 5. Use QPointer instead.
Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.
Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|/
|
|
|
|
|
| |
Change-Id: I9ee4c0760820e9299e238c116936ce8ef140c727
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
names, add where applicable to replace
QCoreApplication::translate().
- Introduce message utility function for the commonly used
'No tool chain set up for this profile' message to
ToolChainProfileInformation.
- Introduce message utility functions related to adding files
to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
QmlProfiler.
Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
|
|
|
|
|
|
|
|
| |
Also removed all <QMainWindow> includes which are not needed
anymore.
Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: Ibce8a4cc32f5bcaa30f9a5b5376f7e64f367455a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
|
|
|
|
|
|
|
| |
In copyToAlternativeLocation function, project directory is better than
home path. at least, It's more clear.
Change-Id: I38faa6aedcda02459f5d4715c35fb0e2e64dd0f6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
Do not try to open non-existant project files when asked to open
an example.
Change-Id: Ibcd106a0a8354f98998e61cafa3f5cd2ce2844b0
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Opening the project jumped to project mode, which doesn't have a help
side bar. We now configure the example project and jump to edit mode
before opening the documentation.
Change-Id: Ic87d3fd0856862ac9297d43307037f994664acdc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
|
|
|
|
|
|
| |
Do not include <QtDeclarative>.
Change-Id: I0a7fb80a775764f57bc3c6785ba7eac862cd71df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Each example can now provide a list of platforms by the examples manifest
.xml file. This list can control the target configuration of the example
when it is opened in the welcomepage.
Change-Id: I893230fd2850b7a1272db71a7f589044d52041d1
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
| |
This patch allows replacing specific pages by id() and priority().
Change-Id: Ief0b01e6a43bdc187625c0b7aa97745588322e5e
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
| |
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
| |
E.g. when showing the example or tutorial browser.
Change-Id: I938d38872c455bbfc6f28b759701e84cd57bf354
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
|
|
|
|
|
| |
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
| |
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
| |
Change-Id: I893b225601a073bc5d74199dba3323f3e233560e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/qtsupport/gettingstartedwelcomepage.cpp
src/plugins/qtsupport/gettingstartedwelcomepage.h
Change-Id: I268072db01064d71bc4828942d71fc772ddd3539
|
| |
| |
| |
| |
| | |
Change-Id: I7e97af90cb7cd4c93abe2330cfbd92581b2be22e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The cropping coordinates are stored in a file
images_areasofinterest.xml. A tool to create/maintain the cropping
coordinates is included in this patch.
Then changes to Delegate.qml prevent QML from scaling the image.
If scaling is needed it is now the job of the Image provider.
dropshadow.png had to be adjusted because the border had different
widths and heights.
Change-Id: Ib25db896d40eeec0e0a373c971931dc5cabf3cbe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Design done by: Virva Auvinen
Change-Id: I94ca75f50d3924088bc7d9be6cc884975480bcac
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|/
|
|
|
| |
Change-Id: I70cfc3250baeff4c10d2c81ad34ac38ec2383b2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
| |
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I271072584882e256c7bfcbc39acdef0b42495bda
Reviewed-on: http://codereview.qt-project.org/6445
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
invokeMethod Qt::BlockingQueuedConnection will deadlock if the event
loop has already stopped.
I use Qt::AutoConnection instead and manually sync using a timeout.
I also react to coreAboutToClose() to avoid unnecessary timeouts.
Change-Id: I941bfd6bb66eeb9040a9ae0900492003ca34e094
Reviewed-on: http://codereview.qt-project.org/6421
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GettingStartedWelcomePage gets instanciated twice now.
The new instance does show the examples and has the title:
"Demos and Examples".
The ExamplesListModel is shared between the two instances and is
a static member.
The method examplesModel() is used to access the ExamplesListModel and
lazily creates one.
QtSupportPlugin creates the two different instances.
Change-Id: Ie5bf9ce8b25aeeacb88731ce1d3179004175fd2f
Reviewed-on: http://codereview.qt-project.org/5706
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995
Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I681bab48aafb029f4869209382493dfa36233a2d
Reviewed-on: http://codereview.qt.nokia.com/3081
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Fixes an occassional assert "Cannot send events to objects owned by a
different thread." with receiver QHelpEngineCorePrivate.
Change-Id: I77ffd663a055c493607907374f7a4d775f6aac6c
Reviewed-on: http://codereview.qt.nokia.com/2289
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|