feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,278 Commits 108 Branches 368 Tags
aa95055eb06c307f571db035af13a60b5dc293d8
Commit Graph

21278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Hunger
aa95055eb0 Git: Update settigspage 
Task-number: QTCREATORBUG-6308
Change-Id: Ie791cee6f132a4aab345d6c9b3cde56053476e8d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 13:32:09 +02:00
Thomas Hartmann
e9ff13518a QmlDesigner.propertyEditor: fix caption for BorderImage 
Change-Id: If09b81ad1e5ea0f6e5bc34633a5b65ec261944d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-18 13:30:11 +02:00
Thomas Hartmann
b69fb4c26c QmlDesigner.desktopWidgetsPlugin: fix for metainfo 
Keep default size of TextField and add Label.

Change-Id: I65a90c810b1ec9a105992ee976b6c9c99aa272bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-10-18 13:29:52 +02:00
Thomas Hartmann
c0b9190044 QmlDesigner.puppet: disable breakbad for qmlpuppet 
Change-Id: Idda4a8b674eaabe24de6b2d0c9f7067046d22d70
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-10-18 13:01:35 +02:00
Tobias Hunger
32064c756d Codepaster: Trim server name 
Task-number: QTCREATORBUG-6329
Change-Id: I236f3ae2526d020596c990089fbe6b0e167b4fd9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 12:40:15 +02:00
Oswald Buddenhagen
f7ca927b68 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>
 2011-10-18 12:14:10 +02:00
Oswald Buddenhagen
58cc0c5a5c 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>
 2011-10-18 12:13:51 +02:00
Leena Miettinen
3dbe54b0fe 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>
 2011-10-18 11:56:01 +02:00
Aurindam Jana
7a1bf412fb 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>
 2011-10-18 11:12:55 +02:00
hjk
63dac82a0a debugger: re-enable interrupting in remote setups 
Change-Id: I6d4503ec78e3ce590691dde69992a1599b506fc5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
(cherry picked from commit 0e8657107c)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 10:52:55 +02:00
hjk
ace2b80602 help: Add '...' to indicate there will be another dialog 
Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 6ae5065704)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-18 10:51:42 +02:00
Robert Loehning
e711c1ad5a Squish: Use isinstance() instead of comparing classnames 
Change-Id: Ia0683902e96f1dc175978bdbb13fbd114f6ad739
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-18 10:40:27 +02:00
Aurindam Jana
705472d3d9 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>
 2011-10-18 10:32:00 +02:00
Tobias Hunger
405b8738be ToolChain: Fix parsing of gcc output and localization 
Task-number: QTCREATORBUG-6253
Change-Id: Icb5b204e93e216c94b369349992d1eb21ec60a62
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-18 10:28:52 +02:00
Friedemann Kleint
5a7d6d66fa 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>
 2011-10-18 09:48:29 +02:00
Robert Loehning
1139006b3f Squish: Let one function handle last page of all project wizards 
Change-Id: I74e2c2f0c50a3131ad66fbde5e4a7fe004b7ebff
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-10-17 18:09:25 +02:00
Pawel Polanski
dbcd5715ad Symbian^3 specific include paths added 
Change-Id: I003066e7aaebaf4508695b8588bb8bea893f992c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 16:48:55 +02:00
Daniel Molkentin
72278e2a4a Manual amendment to c1a8001626. 
Missed one plugin.

Change-Id: Id148f6e818bc18b65cf4b882af6f219a04336978
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 16:38:40 +02:00
Aurindam Jana
2a271e396c 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>
 2011-10-17 16:26:24 +02:00
Daniel Molkentin
147eac7e04 Fix make install for qml designer plugins. 
Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 15:58:29 +02:00
Robert Loehning
429d62823b Revert "Compile with Visual Studio IDE: string macros don't need to be escaped" 
This reverts commit fe80df7e2f.

With the above commit, Creator could not be compiled with MSVC 2008.

Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 15:52:05 +02:00
Daniel Molkentin
c1a8001626 Install qml customstyleplugin in the right place. 
Change-Id: I1519a7df87eb8d6f499fcfd789eebb6aaa8cf58c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 15:40:24 +02:00
Kai Koehne
655e6faae8 QmlProfiler: Keep configuration of attach dialog 
Change-Id: If9f4918a77c874c82fec63eacf1464b78b5d82ac
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-10-17 15:05:19 +02:00
Daniel Molkentin
a9eb880353 Remove obsolete file 
Change-Id: Ic59098bbe57c90359d0bf7df8e3b8639a3aaf2d8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 14:04:42 +02:00
Kai Koehne
c548721c1e 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>
 2011-10-17 12:23:19 +02:00
Peter Kuemmel
fe80df7e2f 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
 2011-10-17 11:28:28 +02:00
Christian Kamm
ea24106373 QmlJS indenter: Fix ternary multiline indent. 
Task-number: QTCREATORBUG-6208
Change-Id: I7e5267291bc01226b5339cb4abdbb15856c58477
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-17 11:22:34 +02:00
Erik Verbruggen
29dff7221d 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>
 2011-10-17 11:17:46 +02:00
Eike Ziller
7e3d41da58 Version bump 
Change-Id: I5a5079377d043c30c7aabefb2c11a4437ae6c92c
 2011-10-17 11:02:12 +02:00
Leena Miettinen
33e8707ae7 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>
 2011-10-17 10:50:46 +02:00
hjk
2c2b3732db debugger: more robust Qt 4 vs Qt 5 detection in dumper 
Change-Id: I2a1eb5181e614899f3cd80e0eaec5be9a3e93c77
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit f626168c62)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-17 10:26:45 +02:00
Thomas Hartmann
e7c211f9ad 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>
 2011-10-14 17:22:03 +02:00
Tobias Hunger
829a1d3451 gitignore: Ignore *.autosave 
Change-Id: I53745ec7b446d76600e93c1adfda41a5cda5810d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-14 16:15:13 +02:00
Leena Miettinen
f85d8ba445 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>
 2011-10-14 15:58:36 +02:00
Robert Loehning
befbfec3b1 debugger: Added function to test NULL pointer dereference 
This was removed in 8d2f0376e2

Change-Id: I238ab3d789b0f22fb510cd936a8bf8c07dbb2b8b
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-14 14:52:20 +02:00
Daniel Teske
18d4d20acb Fix detection of Oxygen style 
Change-Id: I2a28335285869ce477d2c71532ccb44046a0cfa7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 14:34:47 +02:00
Leena Miettinen
7bde24aa87 Doc: shortcut to check JavaScript code syntax 
Change-Id: Ifb726f6739a572b927a43065a55986fef0b73c92
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-14 13:26:06 +02:00
Daniel Teske
bfd644bcf4 Fix documentation for custom project wizard. 
Task-number: QTCREATORBUG-6077
Change-Id: I83e1fc18131992d81aa4e4e5e201ede66d4e6368
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-14 13:25:07 +02:00
Leena Miettinen
a2deab607c Doc: Issues pane filters 
Rename Build Issues to Issues

Change-Id: I6aa6116e8cdaf0f1d9f201335bfebedddca7c237
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-14 13:10:21 +02:00
Christian Kamm
eabd58139d QmlJS: Fix build with Qt 4.7. 
Change-Id: Ibe239db039bd64892a55805847de61dedad76640
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 12:40:16 +02:00
Thomas Hartmann
0945269a10 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>
 2011-10-14 12:39:39 +02:00
Jarek Kobus
62ea86911f Fix typo 
Change-Id: Iec4d97b55b786d792d978e02955761df0caff2e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-14 12:17:44 +02:00
Thomas Hartmann
1b0d6c3431 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 c176c3155b)
 2011-10-14 10:06:08 +02:00
Jarek Kobus
6a3e065903 Update Polish translations 
Change-Id: Iec9f5f1c7bac531bb5d4df74d867f760b1eca976
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-10-14 10:00:19 +02:00
Eike Ziller
2a489d4d4d Add missing command line help. 
Change-Id: Ib1f98fa91293478d0f4271f9032e6e3866c81bab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 08:21:25 +02:00
hjk
f7f3c2d151 debugger: don't show warning about release builds on Mac 
Change-Id: Icc0e4c1b3d08d0373ea0401fca5c05b23ccf4aac
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-10-13 18:24:28 +02:00
Christian Kandeler
5c6e760d0b 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>
 2011-10-13 17:46:25 +02:00
Kai Koehne
f5ec093e3b 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>
 2011-10-13 17:43:57 +02:00
Jarek Kobus
b0a20e1220 Fix typo 
Change-Id: I48babc6f7cae32420d28106f1d82a6aab6f09835
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-10-13 17:30:33 +02:00
Kai Koehne
17ecb5bb71 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>
 2011-10-13 17:22:44 +02:00