OSDN Git Service
Jonathan Liu [Sat, 15 Oct 2011 05:18:47 +0000 (16:18 +1100)]
Add support for Subversion 1.7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Change-Id: Ide2c13f0e69f9807995539b2634ecec216125d5c
Merge-request: 405
Task-number: QTCREATORBUG-6313
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Tobias Hunger [Wed, 19 Oct 2011 08:33:33 +0000 (08:33 +0000)]
scripts: Fix handling of spaces
Change-Id: I8972fc656dadee54467cc710ff2f832f729a2ce8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Thomas Hartmann [Wed, 19 Oct 2011 08:38:53 +0000 (10:38 +0200)]
WelcomePage: fix clicking on title
Task-number: QTCREATORBUG-6348
Change-Id: I13ec93fadcfad83f248e5b5b8615cd8818f8392c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Teske [Fri, 7 Oct 2011 13:40:38 +0000 (15:40 +0200)]
Fix -spec parameter not used in profile evaluation nor code model
Task-number: QTCREATORBUG-4723
Change-Id: I845326bdc8726c27502c66c5aeaacb0d286c54c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 13 Oct 2011 14:58:55 +0000 (16:58 +0200)]
welcome screnn: adjust color of vertical separator
Change-Id: Id607064c522f9d88a981a2b2f7ff4fd75d04ead4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Tue, 18 Oct 2011 15:13:33 +0000 (17:13 +0200)]
Fix licenses.
Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Friedemann Kleint [Tue, 18 Oct 2011 14:01:32 +0000 (16:01 +0200)]
L10n: Update German translation for 2.4 beta.
Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Leena Miettinen [Tue, 18 Oct 2011 13:25:46 +0000 (15:25 +0200)]
Doc: update screen shots
Change-Id: I10783266291a9fe090f8f8f65d3447e791daefff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Tue, 18 Oct 2011 11:56:21 +0000 (13:56 +0200)]
Doc: Maemo Qemu Emulator was renamed MeeGo Qemu Emulator
Update screenshots
Change-Id: I24ed8955ebfe7a35bb0dafcb2bd4f0c4b81c7355
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Pawel Polanski [Tue, 18 Oct 2011 11:48:46 +0000 (13:48 +0200)]
Symbian: Stepping into functions has been fixed
While debugging Symbian C++ applications
stepping into functions has not been working due to
a typo in the python file
Change-Id: I76710fe3f599303059f773030e57d778164bcebb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Oswald Buddenhagen [Tue, 18 Oct 2011 11:50:38 +0000 (13:50 +0200)]
Merge branch '2.3' into 2.4
Conflicts:
src/plugins/debugger/commonoptionspage.ui
src/plugins/madde/maemoqtversion.cpp
src/plugins/projectexplorer/runsettingspropertiespage.ui
Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
Tobias Hunger [Tue, 18 Oct 2011 11:31:06 +0000 (11:31 +0000)]
Git: Update settigspage
Task-number: QTCREATORBUG-6308
Change-Id: Ie791cee6f132a4aab345d6c9b3cde56053476e8d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 10:34:50 +0000 (12:34 +0200)]
QmlDesigner.propertyEditor: fix caption for BorderImage
Change-Id: If09b81ad1e5ea0f6e5bc34633a5b65ec261944d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 10:34:29 +0000 (12:34 +0200)]
QmlDesigner.desktopWidgetsPlugin: fix for metainfo
Keep default size of TextField and add Label.
Change-Id: I65a90c810b1ec9a105992ee976b6c9c99aa272bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Tue, 18 Oct 2011 10:25:08 +0000 (12:25 +0200)]
QmlDesigner.puppet: disable breakbad for qmlpuppet
Change-Id: Idda4a8b674eaabe24de6b2d0c9f7067046d22d70
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Victor Ostashevsky [Tue, 18 Oct 2011 10:44:08 +0000 (12:44 +0200)]
Ukrainian translation updated
Debugging with GDB was translated
Merge-request: 406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I60d87b2985ed041279fb7db35d1d77338a234849
Tobias Hunger [Tue, 18 Oct 2011 10:39:10 +0000 (10:39 +0000)]
Codepaster: Trim server name
Task-number: QTCREATORBUG-6329
Change-Id: I236f3ae2526d020596c990089fbe6b0e167b4fd9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Oswald Buddenhagen [Mon, 17 Oct 2011 17:37:07 +0000 (19:37 +0200)]
compile with Visual Studio IDE, take 2
Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Oswald Buddenhagen [Mon, 17 Oct 2011 17:44:08 +0000 (19:44 +0200)]
de-obfuscate code
remove pointless condition and join identical branches.
Change-Id: Iefe86e580d485cba1a71e2a379781b342d8c75d8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leena Miettinen [Tue, 18 Oct 2011 09:27:30 +0000 (11:27 +0200)]
Doc: move options to a new Build & Run category
Move General settings (from Projects) Tool Chains, Qt Versions,
and CMake settings
Task-number: QTCREATORBUG-6327
Task-number: QTCREATORBUG-6326
Task-number: QTCREATORBUG-6307
Change-Id: I87b2238ac0b44f56363c85366157ae70ac694211
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 15:45:15 +0000 (17:45 +0200)]
QmlCppEngine: StackWindow Behaviour
Enable/Disable the stack window based on engine state.
Update the markers in the stack window correctly.
Change-Id: Idbc694aa2a4be9497e2e3b2c9e9a1f463e1c7692
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
hjk [Wed, 12 Oct 2011 14:34:02 +0000 (16:34 +0200)]
debugger: re-enable interrupting in remote setups
Change-Id: I6d4503ec78e3ce590691dde69992a1599b506fc5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
(cherry picked from commit
0e8657107c8989f91b6f1b1f9ff70547ed5e962d)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 12 Oct 2011 15:56:31 +0000 (17:56 +0200)]
help: Add '...' to indicate there will be another dialog
Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit
6ae50657041efc7c13910b495f25a01043d849bb)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Robert Loehning [Mon, 17 Oct 2011 17:09:51 +0000 (19:09 +0200)]
Squish: Use isinstance() instead of comparing classnames
Change-Id: Ia0683902e96f1dc175978bdbb13fbd114f6ad739
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 13:23:42 +0000 (15:23 +0200)]
QmlEngine: Activate selected frame only in specific states
Selecting a row in stack window activates the frame only if the
state is InferiorStopOk or InferiorUnrunnable, as followed by
gdbengine.
Change-Id: Iad6a16816c0ffd634572f26e1dcf8c3c577502db
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Tobias Hunger [Mon, 17 Oct 2011 18:22:29 +0000 (20:22 +0200)]
ToolChain: Fix parsing of gcc output and localization
Task-number: QTCREATORBUG-6253
Change-Id: Icb5b204e93e216c94b369349992d1eb21ec60a62
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Friedemann Kleint [Mon, 17 Oct 2011 12:21:06 +0000 (14:21 +0200)]
Designer: Hint at case-mismatches of #include if 'Goto Slot' fails.
Task-number: QTCREATORBUG-6310
Change-Id: Ibd10043c775832f3195c39f9d94b72c6d1447c9d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Robert Loehning [Fri, 14 Oct 2011 14:29:46 +0000 (16:29 +0200)]
Squish: Let one function handle last page of all project wizards
Change-Id: I74e2c2f0c50a3131ad66fbde5e4a7fe004b7ebff
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Pawel Polanski [Mon, 17 Oct 2011 14:45:22 +0000 (16:45 +0200)]
Symbian^3 specific include paths added
Change-Id: I003066e7aaebaf4508695b8588bb8bea893f992c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Molkentin [Mon, 17 Oct 2011 14:22:22 +0000 (16:22 +0200)]
Manual amendment to
c1a80016262e3d8f83a8aae2b64105ef4338449b.
Missed one plugin.
Change-Id: Id148f6e818bc18b65cf4b882af6f219a04336978
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 13:06:56 +0000 (15:06 +0200)]
Debugger: Show/Hide Address Column in Stack Window
Show Address column in stack window only if explicitly enabled.
The address column is hidden by default.
Change-Id: I4e4b019dbcde1c2edb9fb3012831eee5054a8a22
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Molkentin [Mon, 17 Oct 2011 13:34:22 +0000 (15:34 +0200)]
Fix make install for qml designer plugins.
Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Robert Loehning [Mon, 17 Oct 2011 13:23:00 +0000 (15:23 +0200)]
Revert "Compile with Visual Studio IDE: string macros don't need to be escaped"
This reverts commit
fe80df7e2ffb9ca334723d13af749c7b3dc973a8.
With the above commit, Creator could not be compiled with MSVC 2008.
Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Molkentin [Mon, 17 Oct 2011 13:33:59 +0000 (15:33 +0200)]
Install qml customstyleplugin in the right place.
Change-Id: I1519a7df87eb8d6f499fcfd789eebb6aaa8cf58c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 09:52:03 +0000 (11:52 +0200)]
QmlProfiler: Keep configuration of attach dialog
Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Daniel Molkentin [Tue, 11 Oct 2011 14:44:20 +0000 (16:44 +0200)]
Remove obsolete file
Change-Id: Ic59098bbe57c90359d0bf7df8e3b8639a3aaf2d8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 11:38:41 +0000 (13:38 +0200)]
Debugger: Enable stack frames without an annotated function
E.g. breakpoints on QML bindings do not have an annotated function.
Still they're valid stack frames you can click on.
Change-Id: I2b9417e6a57b846d74bd5bc661d11027b028c602
Reviewed-by: hjk <qthjk@ovi.com>
Peter Kuemmel [Mon, 17 Oct 2011 09:28:28 +0000 (11:28 +0200)]
Compile with Visual Studio IDE: string macros don't need to be escaped
Merge-request: 400
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I81f335b44fe736f3ffc9ba3212de25edf8589dd1
Christian Kamm [Fri, 14 Oct 2011 10:52:42 +0000 (12:52 +0200)]
QmlJS indenter: Fix ternary multiline indent.
Task-number: QTCREATORBUG-6208
Change-Id: I7e5267291bc01226b5339cb4abdbb15856c58477
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Erik Verbruggen [Mon, 17 Oct 2011 08:24:39 +0000 (10:24 +0200)]
Fixed stack-overflow when parsing insanely nested compound statements.
Thanks to Clang's parser_overflow.cpp which has >16000 nested compound
statements to check exactly the same.
Change-Id: I2b604f8ceb01115d7fe950994e0677a081e99481
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Eike Ziller [Mon, 17 Oct 2011 09:02:12 +0000 (11:02 +0200)]
Version bump
Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c
Leena Miettinen [Fri, 14 Oct 2011 15:12:20 +0000 (17:12 +0200)]
Doc: must use Qt Quick Components when developing for MeeGo
Change-Id: I6ab99cc159a16243f334be06fe9d46aa00c50faa
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
hjk [Thu, 13 Oct 2011 09:41:37 +0000 (11:41 +0200)]
debugger: more robust Qt 4 vs Qt 5 detection in dumper
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit
f626168c629ed226811d6cfa80e4410fd99ebfba)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 15:18:32 +0000 (17:18 +0200)]
QmlDesigner.designDocumentController: fixes update of SubComponentManger
We have to update the SubComponentManger each time the document changes.
Change-Id: Ifb42e3d6b2e123ef651309144ae8f3bbdbe39eb7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Tobias Hunger [Fri, 14 Oct 2011 10:20:49 +0000 (10:20 +0000)]
gitignore: Ignore *.autosave
Change-Id: I53745ec7b446d76600e93c1adfda41a5cda5810d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leena Miettinen [Fri, 14 Oct 2011 11:33:17 +0000 (13:33 +0200)]
Doc: fix bug
Task-number: QTCREATORBUG-6311
Change-Id: I99089d0ec7eb95a007fa21ab41d76da280472975
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Robert Loehning [Fri, 14 Oct 2011 12:00:17 +0000 (14:00 +0200)]
debugger: Added function to test NULL pointer dereference
This was removed in
8d2f0376e22c4f7dd15acea9c17ecb4eb2ab9423
Change-Id: I238ab3d789b0f22fb510cd936a8bf8c07dbb2b8b
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Fri, 14 Oct 2011 11:02:37 +0000 (13:02 +0200)]
Fix detection of Oxygen style
Change-Id: I2a28335285869ce477d2c71532ccb44046a0cfa7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leena Miettinen [Fri, 14 Oct 2011 11:12:53 +0000 (13:12 +0200)]
Doc: shortcut to check JavaScript code syntax
Change-Id: Ifb726f6739a572b927a43065a55986fef0b73c92
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Daniel Teske [Tue, 11 Oct 2011 15:35:23 +0000 (17:35 +0200)]
Fix documentation for custom project wizard.
Task-number: QTCREATORBUG-6077
Change-Id: I83e1fc18131992d81aa4e4e5e201ede66d4e6368
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Fri, 14 Oct 2011 10:29:53 +0000 (12:29 +0200)]
Doc: Issues pane filters
Rename Build Issues to Issues
Change-Id: I6aa6116e8cdaf0f1d9f201335bfebedddca7c237
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Fri, 14 Oct 2011 10:26:18 +0000 (12:26 +0200)]
QmlJS: Fix build with Qt 4.7.
Change-Id: Ibe239db039bd64892a55805847de61dedad76640
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 10:33:24 +0000 (12:33 +0200)]
QmlDesigner.property: fix specialization of property pane
If a super class has a specifics pane use it and only autogenerate
missing properties.
In ItemPane.qml make sure the autogenerated properties come first.
Fix the template generation. If not code for any property is generated
the template is empty.
Change-Id: Ia93c55cd9f428a5ebea12d0e807a7e9ab185f0bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Jarek Kobus [Fri, 14 Oct 2011 08:36:35 +0000 (10:36 +0200)]
Fix typo
Change-Id: Iec4d97b55b786d792d978e02955761df0caff2e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Thomas Hartmann [Mon, 10 Oct 2011 14:51:13 +0000 (16:51 +0200)]
QmlDesigner.itemLibrary: fix for desktop widgets
Use the implicit size.
Change-Id: I97b2e45d5cb6198547f34421ee12a07385a96b2c
Reviewed-on: http://codereview.qt-project.org/6356
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
(cherry picked from commit
c176c3155bb184e526a9199e93db5af24f4d9e95)
Jarek Kobus [Fri, 14 Oct 2011 07:47:27 +0000 (09:47 +0200)]
Update Polish translations
Change-Id: Iec9f5f1c7bac531bb5d4df74d867f760b1eca976
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Eike Ziller [Thu, 13 Oct 2011 07:22:28 +0000 (09:22 +0200)]
Add missing command line help.
Change-Id: Ib1f98fa91293478d0f4271f9032e6e3866c81bab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 13 Oct 2011 16:06:58 +0000 (18:06 +0200)]
debugger: don't show warning about release builds on Mac
Change-Id: Icc0e4c1b3d08d0373ea0401fca5c05b23ccf4aac
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kandeler [Thu, 13 Oct 2011 15:17:53 +0000 (17:17 +0200)]
Harmattan: Support "no Aegis manifest file" case.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I66aa22140362141c36070ab971d2283f60bcb49d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 14:30:14 +0000 (16:30 +0200)]
Debugger: Automatically adapt to the languages the running engine supports
We used to get the layout only from the current/last run configuration. However,
this fails for engines started by other means (Debug->Start Debugging submenu).
Change-Id: I87e12457c7cd68a326ac1827298a3542e149199b
Reviewed-by: hjk <qthjk@ovi.com>
Jarek Kobus [Thu, 13 Oct 2011 15:23:06 +0000 (17:23 +0200)]
Fix typo
Change-Id: I48babc6f7cae32420d28106f1d82a6aab6f09835
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 13:32:42 +0000 (15:32 +0200)]
Debugger: Avoid "Could not connect ... QML debugger" warning for mixed debugging
There's a race condition between the QML Engine trying to connect after the app printed
"Waiting on debugger port ...", and any possible Cpp breakpoints stopping the app.
Therefore, don't annoy the user with "Could not connec to QML Debugger" warnings
while the Cpp debugger is stepping.
Change-Id: I77f6f98e835e45363c5d47e10b39df249f65a1a3
Task-number: QTCREATORBUG-6249
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 11:22:26 +0000 (13:22 +0200)]
Debugger: Avoid 'start debugging' action being enabled why debugging
Don't let updateDebugActions() (triggered e.g. by project changes)
mess with the state fo the Start Debugger, Step, Next actions while
an engine is running.
Change-Id: I08ee20c70f9ff712f928f8ba04ac3d60d5669f11
Task-number: QTCREATORBUG-6290
Reviewed-by: hjk <qthjk@ovi.com>
Kai Koehne [Thu, 13 Oct 2011 09:06:07 +0000 (11:06 +0200)]
Debugger: Disable stepping from QML->CPP for the time being
Change-Id: Iafcc460a374bada67609dc1210cc1b787d267bfa
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Kai Koehne [Wed, 12 Oct 2011 14:28:33 +0000 (16:28 +0200)]
Debugger: Expose which languages (QML, C++, Any) an engine supports
Change-Id: Ia690b5cda84738c303ae7b6bd579e43313728525
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 12:01:28 +0000 (14:01 +0200)]
Actually delete CONFIG+=declarative from list of user arguments
Fix incorrect merge in
b0efd44d20e9129c40b47ad3715c248962a947b9 .
Change-Id: I7b007cdaf89732336463685a1af7000584a46e6e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Robert Loehning [Thu, 13 Oct 2011 12:29:51 +0000 (14:29 +0200)]
Squish: Moved remaining functions for creating projects to project.py
Change-Id: I92b56ed9401be41d0a54dd32c623b55b7d1e4f71
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Leena Miettinen [Thu, 13 Oct 2011 08:29:02 +0000 (10:29 +0200)]
Doc: QML and C++
Change-Id: Ic0d5906cdd16a08196d4240265f4179a93936f5e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Eike Ziller [Wed, 12 Oct 2011 08:03:27 +0000 (10:03 +0200)]
Adapt default window size to larger window borders.
Also remove old compat settings reading code.
Change-Id: I460322e4ee5167f98ee2c2f258cee956c70e1612
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Thu, 13 Oct 2011 11:30:38 +0000 (13:30 +0200)]
QmlDesigner.contextMenu: fix for layout
Now the items are properly sorted in the layout.
Change-Id: Ib1d65ef5a67e618f3e42841c92a5f1fce310d67c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Thu, 13 Oct 2011 11:24:05 +0000 (13:24 +0200)]
QmlDesigner: crash fix
instanceParent() can be invalid.
Change-Id: I804879491544500e20426a25515b1997022a102c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Thu, 13 Oct 2011 09:10:25 +0000 (11:10 +0200)]
Debugger: Ignore instruction-wise operator mode for stepping QML
Change-Id: Idfd703acb9876041916cc3b1a04b5c031af2c12b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Thomas Hartmann [Thu, 13 Oct 2011 11:09:11 +0000 (13:09 +0200)]
QmlDesigner: changes-2.4.0
Change-Id: Ie2f20a8b8bcfd0ec7837a6abfb7816756e27d0e2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 15:26:18 +0000 (17:26 +0200)]
QmlCppEngine: Make sure that breakpoint markers get removed
resetLocation() called by DebuggerPlugin::handle* should automatically
reset the locations for stepping etc.
Change-Id: I3e20f93ade7f40e1e1f33b1b48b11522b59771f8
Task-number: QTCREATORBUG-6291
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Christian Kamm [Wed, 12 Oct 2011 11:47:27 +0000 (13:47 +0200)]
QmlJS: Fix QUrl completion with Qt 4.8.
QUrl no longer treats scheme-less urls as local files.
Change-Id: Ie219985d653a692937ff9a5ebbafc455cd3dca13
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Thu, 13 Oct 2011 08:55:20 +0000 (10:55 +0200)]
Update 2.4 changelog for C++ and QmlJS changes.
Change-Id: I3f09460a125469504fe4ecf7124b71fa1f068e17
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Leena Miettinen [Wed, 12 Oct 2011 12:51:08 +0000 (14:51 +0200)]
Doc: semantic highlighting for JavaScript
Change-Id: If5dfce9581fbbde3d5553f159bc0dd46ce30a5b2
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Joerg Bornemann [Wed, 12 Oct 2011 16:34:42 +0000 (18:34 +0200)]
changes-2.4.0 updated
Change-Id: Icbbb01f9b56f0e3d41da5ec2e0cd09c84162aff0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Wed, 12 Oct 2011 14:24:43 +0000 (16:24 +0200)]
QmlDesigner: fix typo
Change-Id: If02d4ae2c5c3dddd877fef80af6eebcd10914b5a
Reviewed-by: hjk <qthjk@ovi.com>
Kai Koehne [Wed, 12 Oct 2011 13:48:59 +0000 (15:48 +0200)]
Task Pane: Sort list of filters alphabetically
Change-Id: Ife88fd800da42d45c859a5637bfa4259f898add2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 11:49:26 +0000 (13:49 +0200)]
FileInProjectFinder: Fix gcc warning
Change-Id: If58d9e84b34fbc2cbe755fb0d1492e305d4eadd1
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Leena Miettinen [Wed, 12 Oct 2011 12:29:55 +0000 (14:29 +0200)]
Doc: finding QML components with Find Usage
Change-Id: I66565602b9d63897f32bcb20bf68f9077d42fc54
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 11:24:26 +0000 (13:24 +0200)]
DebuggerMainWindow: Fix issues with default layout
Make sure all docks are properly tabified, even when not visible.
Change-Id: I4c7eb0016d95c8c75d63db939569e6d9e32e57ae
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 10:49:52 +0000 (12:49 +0200)]
Debugger: Remove commented out code
Change-Id: I17ecaed325cb362fad008a77533dafc442a0209e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Wed, 12 Oct 2011 10:48:56 +0000 (12:48 +0200)]
Debugger: Initialize default layout for both QML and QML/CPP
Change-Id: Ib52c1664f0273d573bed28b8640d77e5292d40e3
Reviewed-by: hjk <qthjk@ovi.com>
Kai Koehne [Wed, 12 Oct 2011 10:47:24 +0000 (12:47 +0200)]
Debugger: "Reset to default layout" resets both QML and QML/CPP layout
Change-Id: Ia2d0de65d772826697ec51e6f82dc0e3fe36e05b
Reviewed-by: hjk <qthjk@ovi.com>
Jarek Kobus [Wed, 12 Oct 2011 12:30:36 +0000 (14:30 +0200)]
Fix typo
Change-Id: I257c749ea8376a424cf343c5695bd983ffb457a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Christian Stenger [Fri, 7 Oct 2011 13:43:45 +0000 (15:43 +0200)]
Squish: Fixed some minor problems
* problems on shutdown (mostly Win)
* timing problems (Mac, Win)
* support for accidental whitespace in settingspath (all)
* added support for further special characters that could exist
inside TreeView of the Project files (all)
* removing the testing folder instead its content (all)
Change-Id: I146b56d253e3245641d0dcaebfad4d6f1dd684fc
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Leena Miettinen [Wed, 12 Oct 2011 09:20:42 +0000 (11:20 +0200)]
Doc: checking JavaScript syntax
Change-Id: Iad66cc619ed1027389569dea9bfd72bea6399af6
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Wed, 12 Oct 2011 11:11:20 +0000 (13:11 +0200)]
QmlJS: Clean up completion logic.
To avoid '/' triggering a global completion and improve code
readability.
Change-Id: I0cdb8efb159199156a766982db8979ee987f414b
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Leandro Melo [Wed, 12 Oct 2011 11:00:27 +0000 (13:00 +0200)]
Update changes file
Change-Id: I1ca9379934f0b4ac5605fc25a3dc25343a7485ce
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Jarek Kobus [Wed, 12 Oct 2011 10:28:38 +0000 (12:28 +0200)]
My changes
Change-Id: Idc3a62fef782d7cd594552847f389fe2ce08ed38
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Eike Ziller [Wed, 12 Oct 2011 09:51:36 +0000 (11:51 +0200)]
Add my changes.
Change-Id: I66c1a15b8e2cce8678024f3ff8929ab3c0a30790
Reviewed-on: http://codereview.qt-project.org/6517
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Yuchen Deng [Sat, 8 Oct 2011 14:58:13 +0000 (22:58 +0800)]
Git: Fixed launch gitk failed
Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6510
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Jarek Kobus [Tue, 11 Oct 2011 08:33:32 +0000 (10:33 +0200)]
Add a label explaining the goal of editable preview
Change-Id: I6e3455f5767862150f95beac1ea4b7655619ca0c
Reviewed-on: http://codereview.qt-project.org/6363
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Kai Koehne [Tue, 11 Oct 2011 13:17:44 +0000 (15:17 +0200)]
FileInProjectFinder: Normalize project directory before checking for changes
Change-Id: Ia6ee0b0f8110add4a54bd470831d457dbb17c9c9
Reviewed-on: http://codereview.qt-project.org/6439
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Christian Kamm [Fri, 30 Sep 2011 13:04:45 +0000 (15:04 +0200)]
QmlJS highlighter: Highlight name after 'as' in imports.
Also fix a problem with the scope not being updated after initial
construction.
Change-Id: If5cf70bb029857b317ebbee3a6c4ee421213f24c
Reviewed-on: http://codereview.qt-project.org/6115
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Wed, 12 Oct 2011 06:53:43 +0000 (08:53 +0200)]
QmlJS: Fix the fix for scope chain rebuilds.
Change-Id: Idf18d44e647a2019405199bcc5273afb03816af1
Reviewed-on: http://codereview.qt-project.org/6498
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Thu, 6 Oct 2011 10:17:25 +0000 (12:17 +0200)]
QmlJS: Update builtins.qmltypes from Qt 5.
Adds QSGMouseEvent for completion inside MouseArea signal handlers.
Change-Id: I3e35a9d38dbf56848b3df5714efe82dd1ea88ea7
Reviewed-on: http://codereview.qt-project.org/6402
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Tue, 11 Oct 2011 10:47:46 +0000 (12:47 +0200)]
QmlJS: Allow for 'ModuleApi' elements in qmltypes files.
But ignore them for now. Reading them is a new feature that will
be introduced in master.
Change-Id: Id362caab2e3b48e198d87f59a0a7d99d24267378
Reviewed-on: http://codereview.qt-project.org/6431
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
OSDN Git Service
