Commit Graph

25792 Commits

Author SHA1 Message Date
Friedemann Kleint
0869a13938 Display proper overlay icons on Windows/Qt 5.
Task-number: QTBUG-27450

Change-Id: I521823dc586c304a5242a79f04489e5bc0fdb702
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 12:34:34 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 12:24:24 +02:00
Eike Ziller
2b56943a8e Change the default plugin provider to QtProject.
Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:39:40 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:10:50 +02:00
Friedemann Kleint
7e98b97326 Fix warning about unknown toolchains.
Change-Id: Ifd55ab4ea504d75996a350274dcaf62a1d08db04
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:04:06 +02:00
Andreas Holzammer
47ff91a584 Set executable flag on applications while deploying
Under Windows there is no executable flag in the filesystem.
So take the information that we got, which file
is an executable and set the executable flag if needed.

Change-Id: I0a7026911d1f7791434c39cc0917d6e49cfa1667
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-09 11:02:48 +02:00
Tobias Hunger
5554e3616e Fix some more copyright headers that got missed somehow
Change-Id: I486c5c5c7c7330593ea7812dff172ba70d0fe86b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 10:56:34 +02:00
Tobias Hunger
103d910aff Remove some nokia urls
Change-Id: Idfe672691b6b412074d3170c5dc5354aabb8ea05
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-09 10:56:19 +02:00
Eike Ziller
110f102fec Remove default for QTC_PREFIX for Linux.
It was doing more harm than it helped.

Change-Id: I670c4669f18ec0ed833bea6f7d5e9834c130210c
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2012-10-09 10:13:36 +02:00
Christian Stenger
38e27f8056 Squish: Fix checkDebuggingLibrary()
Additionally:
* extracted iterateKits() for better re-use
* added parameter to iterateQtVersions() for easier usage
  when using iterateKits() as well

Change-Id: I8bec8ca8e1e37a233c121dbcfbf1c89104f79a7d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-09 10:03:22 +02:00
Tobias Hunger
f0629b6b77 Move settings from Nokia to QtProject
Store settings in QtProject, not Nokia. Move them over to the new
place if any settings in Nokia exist.

Task-number: QTCREATOR-7976
Change-Id: I5af77923aa51016add9079b21e78d94d46f20010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-08 18:24:33 +02:00
Eike Ziller
da2ae22036 Install VS redistributable on Windows.
Change-Id: I0669ae1e2aacb0088af8619c19a54a16fa568ea3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-10-08 18:12:16 +02:00
Eike Ziller
1d0b58cd00 Fix installation of desktop icons.
The icons are referred to with the name QtProject-qtcreator in the
desktop file.

Task-number: QTCREATORBUG-7955
Change-Id: Iaf6e270acdf0ac3259169dc39943bc78e33e0d96
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-08 16:18:35 +02:00
Christian Stenger
5fb8040194 Squish: Stabilize placeCursorToLine() on Mac
Change-Id: I3a3292b8576fe36107335e07e9f125fbd1478b80
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-08 16:12:46 +02:00
Tobias Hunger
32e486a9fe Fix copyRecursively not returning when it should
Change-Id: I5d81ede970340e11d789564d9153284236ea426d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-08 15:13:43 +02:00
Yuchen Deng
0a33ef362a Restore system kits only if the kit file exist
Change-Id: I2e5e31d2d744203d2a0834a3169a73c43e61447d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-08 15:12:00 +02:00
Leena Miettinen
101085a488 Doc: adding system packages
Change-Id: I66a91303d7ad683e83aae57fd8d3465ec8506ae3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2012-10-08 15:07:06 +02:00
Joerg Bornemann
cc0c2f69eb share.qbs updated
Change-Id: Ia2e439a068dff75ebfa18c36f749967200961fd5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 14:33:17 +02:00
Leena Miettinen
e78d564242 Doc: update screenshot of Configure Projects tab
Change-Id: Ifc77d2c35e833def2372315aece4bb47b682df13
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-08 14:21:26 +02:00
Andre Hartmann
82d312aad6 Fix encoding of non-opened include files.
The old implementation readed the file and converted the QString toUtf8,
which seems wrong. Now use Creators default encoding.

This fixes at least wrong macro offsets that leaded to highlighting
errors in Find Usages, if there were non-ASCII characters before the
macro definition.

This should also partially solve QTCREATORBUG-7122.

Change-Id: Ic4a5add5f4769bd3d5b62fc2d67598e7abf352d9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-10-08 14:18:51 +02:00
Leena Miettinen
480163efb4 Doc: move description of plain C projects
The projects have been moved to non-Qt projects.

Change-Id: I98721458114c9cc92f7416ac37d6a37c4d77279b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-10-08 14:14:36 +02:00
Robert Loehning
bdceb60dd0 Fixed "can not"
Change-Id: I1ebfee92df0f4bd2e9520a4e831352b780d6b556
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-08 13:34:18 +02:00
Joerg Bornemann
f0e40373d2 qbs files: change file tag of Qt5 plugin metadata files
Change-Id: I3d20ad6efe4c6ed8cd87717ef4fdd58a739ad634
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 13:27:08 +02:00
Leena Miettinen
43b20f8d75 Doc: fix a typo
'desigm' should be 'design'

Change-Id: I885a5082c0517cca8e3f6cbe7ca40383ddee0cff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-08 11:41:10 +02:00
Leena Miettinen
22b7450496 Doc: Qt Quick Designer only supports Qt Quick 1
Change-Id: Ic0e746a053522d494d03e9add6cc4813072d0ec3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-08 10:41:05 +02:00
Thomas Hartmann
880ab20751 QmlJS: Fix rewriter for signal parameters
Task-number: QTCREATORBUG-7931

I had to fix a bug in the QmlJsParser.
The source location for the
propertyTypeToken was not initialized in all cases.

I also updated qmljs.g.

Change-Id: Idd0880f70578867cf5f97666aede654e00cfc744
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
2012-10-08 10:27:02 +02:00
Nikolai Kosjar
366a9316ff Enable webkit for help plugin (Qt5 Build).
Now the formatting in the help viewer looks as usual again.

Webkit was disabled to make creator compile with Qt5 in the Nov 2011
days.

Change-Id: Ic926cc94bda4a4953360f2daee414ba17aa4037b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-08 09:55:57 +02:00
Robert Loehning
6c15f14bab Fixed typo
Change-Id: Ia5930fbbaf5af4b5d92f64101fa0a8e6f1d4d15f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-05 17:31:32 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Friedemann Kleint
0fc9e7c877 Fix ambiguous shortcuts in the Git submit editor.
Task-number: QTCREATORBUG-7965
Change-Id: I4f1988a1f3bac7afe1d7195a74bdb874b1041344
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian A. Reiter <christian.a.reiter@gmail.com>
2012-10-05 15:54:50 +02:00
Eike Ziller
1589df13e6 Remove special characters from installer license
Task-number: QTCREATORBUG-7954

Change-Id: Ib188f80994ceea252bba02d1e6ac2b0f32a84157
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 15:22:20 +02:00
Tobias Hunger
dd6517a976 hasCopyright: Creator does not use GPL license
Change-Id: I24ce89117812a7f15913dc092687910a39da9358
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 15:21:03 +02:00
Aurindam Jana
9b68e81fea Inspector: Select only known objects for 4.x
Change-Id: If052b4a018d5d0c20086a0251d7d1b206e7d4192
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-05 15:11:26 +02:00
Christian Kandeler
6f7ce3f48e SSH: Work around issue with dynamic_cast.
It has been observed that on MacOs, a dynamic_cast from
Botan::Public_Key to Botan::RSA_PublicKey reproducibly fails even though
it should definitely succeed. This happens with both gcc and clang on
different Macs, but on no other platform. The problem could not be
reproduced with an example project.
The workaround is to move the allocation of the respective object from
the client side to the Botan library itself. In addition, the following
actions were taken to guard against similar problems in the future:
    - Also move to Botan the allocations of all other objects that are
potentially dynamically cast.
    - Use shared pointers for these objects, so the deallocation also
happens inside Botan.

Change-Id: Ie595a56a239a41e2629b6ff631de59910b8244dd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 14:35:32 +02:00
Eike Ziller
62422de5d0 Remove feedback link.
The form has vanished and wasn't up to date anymore anyhow.

Change-Id: I40292593e8e705da0b5e47f54ab6c1a519144404
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-05 14:19:27 +02:00
Leena Miettinen
6f1f4f014e Doc: added some Mac OS commands
The screenshots are now taken with a Mac and the text looked wrong.

Change-Id: I3b2358255eee752cdb6b0a21b7fb802916011771
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 13:50:01 +02:00
raidsan
6b5bccd08e "Find Usages" and "Refactor" may decode error.
Task-number: QTCREATORBUG-7204

Change-Id: I6ce82c701246ddac9cadcdd22ef994b0086ce8f7
Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 13:38:08 +02:00
Daniel Teske
9de676ce03 CMake and Kits: Fix interaction between them
On initial run we offer the user a choice between all the kits, which
are compatible with the cached generator. After the initial run, the
user can't change kits nor generators anymore.
Except if the builds into a new directory or adds a buildconfiguration,
then the user can choose between generators but not kits.

Task-number: QTCREATORBUG-7940
Task-number: QTCREATORBUG-7928

Change-Id: I9b663435cd2e021f7fe08379c1c487a6aebe8976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
2012-10-05 12:17:03 +02:00
Tobias Hunger
ffb90dff22 Update copyright check script
Use perl instead of bash and avoid lots of rereading of the file,
making the script much faster to run.

Change-Id: Ic898f324b2952c593b89d8efca8ea1e344cf5858
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 11:49:06 +02:00
hjk
ecf8b82cdc debugger: fix QMap dumper/gdb pretty printer for Qt 5
Change-Id: If1b2dcb6d517b837a135fbdb97cde422122464c3
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 11:23:46 +02:00
hjk
4265d47c78 debugger: fix display of QObject object names for Qt 5
Change-Id: I58ad709575f4846812de3e2109112be170e8e433
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-05 11:23:20 +02:00
Daniel Teske
2cc4ec031a Qt4BuildConfiguration: Fix extractSpecFromArguments with symlinked dirs
The canonical form of the -spec argument is a relative path if the
mkspec is a child of the mkspec dir. Since we resolve all symlinks for
the mkspec, we must do the same for the mkspec dir.

Task-number: QTCREATORBUG-7908
Change-Id: I24628c2d49ff7ad078caa6fd3896cb407d0d7906
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-05 11:12:55 +02:00
Kevin Krammer
4c562cdf19 QNX: fix image size checks in project wizard
Upcoming BlackBerry devices require larger icon/splashscreen sizes than
the ones the plugin code was originally created for.

Use place holders in error strings to avoid further string changes
on future size changes

Change-Id: I1065fa68eeba4e03a60fee85da6dbb8922160af8
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 09:56:06 +02:00
Tobias Nätterlund
26ef19061c QNX: Fixup bar-descriptor.xml files
- Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH
- Make application ID depend on project name

Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 09:55:06 +02:00
hjk
fac636602f debugger: fix build of manual test app with Qt 5
Change-Id: I58f63941038978b665455025313faafc851bccc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-04 17:27:02 +02:00
Thomas Hartmann
d5feaae4d3 QmlDesigner: fix runtime warning
m_controlShape is not in any scene.

Change-Id: I5047bf43cf33be409c7644ff03beee3e04ffbd60
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-04 17:01:11 +02:00
Thomas Hartmann
aa619e354e QmlDesigner: crash fix
1000ms is too long. It was possible to close the designer
before the 1000ms finished.

100ms make it impossible to close the designer fast enough
to trigger the crash.

Change-Id: Ie12b406298350551551b36cb021b560eeeba7ecf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-04 17:00:45 +02:00
Tobias Hunger
0bcf6930d3 Add Close button to window asking what to do with changed documents
Add a close button to window asking what to do with documents that
were changed outside Creator. Finally a simple way to get rid of
open moc-files that trigger this window over and over again:-)

Task-number: QTCREATORBUG-7360
Change-Id: I7a373ed60d85d810caf6604bc7dae7bb7fa186a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 16:51:18 +02:00
Tobias Hunger
9c2c8db4ed Fix removal of temporary Qt versions and kits
Change-Id: Icae877d0c809ce6952b47d51e575930696738349
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 16:51:00 +02:00
Orgad Shaneh
b55dcc29ae ClearCase: Fix top level optimization for unix
Also use the optimization for snapshot views as well.

Change-Id: Ic8c2d9f874f09b6b3b4a50eb8c5d396f10ecd6cd
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 16:50:11 +02:00