Commit Graph

21346 Commits

Author SHA1 Message Date
Friedemann Kleint
6f613bc2f1 Compile fix on Linux.
Change-Id: I046c3a843c9a77ccb1c0f6569220d1c7497d26f4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-18 16:56:24 +02:00
Friedemann Kleint
46a2ea97a1 Revert "L10n: Update German translation for 2.4 beta."
This reverts commit bcfa5753620df669860e53f63eb0a3b38e021574

Change-Id: Ia9042e90333a51c62f52cfb7a8660dd747dae393
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-18 16:12:21 +02:00
Friedemann Kleint
66f52daf00 L10n: Update German translation for 2.4 beta.
Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-18 16:07:14 +02:00
Fawzi Mohamed
7ebbc12bde zeroconf: fix windows building
Correct exports, fixed commented out ifdef, moved socket including to a separate header.

Change-Id: Iadb6f58e2c3dbadee411fc0df7c7519c1d90309d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-18 15:53:24 +02:00
Fawzi Mohamed
8eda5774a3 zeroconf/mdnssd: build the fallback daemon on all linux flavors
Change-Id: Ie70fe778611bf4e6d48ed7e7e766dac4daf1eef2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-18 14:32:48 +02:00
Christian Kamm
89ff3cebe6 QmlJS: Introduce UnknownValue.
To distinguish known-to-be-undefined from a genuinely unknown value.

Change-Id: I606b4ea4d726f94553400b8950d3c0a4e76564a8
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-10-18 13:16:18 +02:00
Joerg Bornemann
4cb8ec6a32 fix <S-Ins> short cut in text editor
Only <Ins> should switch to overwrite mode.
<S-Ins> is supposed to paste text.

Change-Id: I66dd94d210488312a222a408cddb793451d14580
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-18 12:01:10 +02:00
Fawzi Mohamed
ccf8d6d660 zeroconf: embedded mdnssd daemon
Allows zeroconf to work also on ubuntu/linux in a network where there
is a local domain (like nokia).
This code is taken with as little changes as possible (to ease merge)
from apple mDNSResponder 320.5 (thus it does not respect Qt code guidelines)

Change-Id: Ic68ec3970ee9d6b02d2dc7cfb0ae1fbaf5a95bef
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-18 11:52:24 +02:00
Fawzi Mohamed
bb5c27c180 zeroconf: native avahi, and working fallbacks
* supports avahi through its native interface
* starts embedded deamon if found
* tested all fallbacks on ubuntu
* Service is a normal object now
* several smaller improvements
Change-Id: I36288ec6fcefb64a60b6284e4d86d4b589ba37b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-18 11:50:32 +02:00
Kai Koehne
a0e0a125c9 QmlProfiler: Also store sysroot in settings
Change-Id: I323798b47d5f7fcdf8ad70ee3def89814a6522e9
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-18 11:34:59 +02:00
Leandro Melo
b1b4ccccbb Editors: Make base replace use RefactoringChanges
This fixes the encoding related issue below and also makes the code cleaner.

Task-number: QTCREATORBUG-6147
Change-Id: Ia61815217433da327206590b515e10d654bcc03f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-10-18 11:33:18 +02:00
Christian Kamm
8532e7b1b7 QmlJS checks: Limit warning about unintentional empty blocks.
width: {
    }

should not trigger a warning. We now only warn if { and } are
on the same line.

Change-Id: I45fa846ff63d0a83de782c412212165845c07e72
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-10-18 08:15:11 +02:00
Eike Ziller
1868dd94f0 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: Ie1ecdbaefb9cabebd90bc7c0f8837cc31dbac5af
2011-10-17 16:44:41 +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
47bda54f07 FileInProjectFinder: Avoid double slash in sysroot'ed path
The file path from the device is already absolute, no need to add
another slash.

Change-Id: I591eb5ffee38bcea28564dcdc20541ee40f306a8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-17 15:05:29 +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
Kai Koehne
f925ecb30f QmlProfiler: Add "Sysroot" field to attach dialog
Change-Id: Id3c6a0eaa90096f2a7a0bdcfac10644e10e8858c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-17 15:05:02 +02:00
Eike Ziller
8eb8368139 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
2011-10-17 14:22:32 +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
Yuchen Deng
4ea9c21932 C++: Improve completion assist
Avoid inserting characters that are already there.
e.g.
int testFly() {}
te|Fly()
When triggers a completion, the code will changed to:
testFly()|
But in before, the code will changed to:
testFly()|Fly()

Notice:  Character of '|' show the cursor position.

Change-Id: I6c111e30356b2549aebc6fbea05608e70d6ab41f
Merge-request: 398
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-17 12:22:00 +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
Joerg Bornemann
3f01f551bd remove nonexistent include path from glsl.pri
Change-Id: I66afdc3a380f9e5b901906349863e33ae353b2ae
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-10-14 15:48:37 +02:00
Daniel Teske
4fe26cb509 Remove processEvents
Change-Id: I8daa2a9675d72886aa598d4f17ee48e55665f92a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-14 15:19:39 +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
171f8b50fd Make MaemoInstallPackagToSysroot* thread-safe
Change-Id: If4ded3f5596c16409012edf267d96a72c3b7f4ad
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-14 14:43:31 +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
Daniel Teske
48e425209a Remove unused functions
Change-Id: Ia963100fe3ab6ebae0eeaa7f28479fd2dc819a37
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-10-14 13:05:41 +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
Christian Kandeler
8492fae7d1 RemoteLinux: Include sysroot in incremental deployment logic.
Change-Id: Ib4a2ea3edb30b852d1eb145d129185b256dcaf06
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-10-14 12:28:35 +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
Joerg Bornemann
a10aabc967 overwrite mode support for the text editor
Change-Id: Ibe0b8123429721511ebfde15a604229982fdc5d1
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-10-14 11:02:20 +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