Commit Graph

32182 Commits

Author SHA1 Message Date
Rainer Keller
92f9d286ab Fix path calculation for Boot to Qt
Change-Id: I090bfe935c0c69e7689449ef2b76aff7273445a5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-07 16:54:26 +02:00
Eike Ziller
c05e9d52b2 Ios: Move tools to <libexec>/ios, make them lowercase, fix deployment
They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.

Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-07 15:32:10 +02:00
Thomas Hartmann
810274d038 WelcomePage: Bring back the tutorials page
The tutorials page was removed during refactoring.

Change-Id: Iec779d4fcf86f1807e17a5be775698b64ce16655
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-07 14:06:44 +02:00
Leena Miettinen
b32d7f4c90 Doc: fix link to deploying to BB10 topic
The title was wrong, which was causing the fixnavi
script to fail.

Change-Id: I631c8f3dcdbebbe3ee4f6bc003986929da0813c6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-07 13:58:41 +02:00
Eike Ziller
1a7f77c6b7 Make the pattern used for installers overridable
Change-Id: If34cd0edcf50884ffaee8879628acaa019a432ac
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-10-07 13:36:32 +02:00
Christian Kandeler
90a056e1cb Remove unneeded #ifdefs.
Change-Id: I696133c42a142a8c596703fc8ce0250b58993d99
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-07 12:49:13 +02:00
Daniel Teske
03e76337ca AndroidExtraLibraryListModel: Fix crash on removing libs
Steps to reproduce the crash, start with the list a b a c, select the
second a and the c. Click on remove. The removeEntries will find that it
can remove two consecutive entries in one beginRemoveRows/endRemoveRows,
but will wrongly remove them starting at the first a.

The fix is too simply order the modelindexes in descendeding order such
that removing entries does not modify the rows.

Change-Id: I4be349f4bab8137075da0d8dfcef24f10dc25f92
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-07 12:13:18 +02:00
Nikolai Kosjar
872bfb7094 CppTools: Adapt C++ locator names to reality
The new names are:

* C++ Methods in Current Document -> C++ Symbols in Current Document
* C++ Classes and Methods -> C++ Classes, Enums and Functions
* C++ Methods and Functions -> C++ Functions

Further notes:

* "C++ Classes" stays the same.
* The term "Methods" was removed since "Functions" says it all (member
  functions, non-member functions). Because of this, the "m" shortcut
  for this filter does not fit so well to the name anymore.
* "C++ Symbols in..." - "Symbols" means the same as in the C++ Search
  dialog: classes, enums, functions and declarations

Change-Id: I8e5f410f2dcb1fafe83d0a1c8607f4c17eabbb8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-07 12:06:20 +02:00
Orgad Shaneh
1ca6842bcd Git: Fix compiler warnings
Unhandled enum values in switch

Change-Id: I6533d8773ff4fa663a1e33c1f95c81f53790b642
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-07 12:02:39 +02:00
Eike Ziller
ac9f9526f9 iOSProbe: Cosmetic cleanup
Style fixes and remove unused symbols.

Change-Id: I941c99e08842940a7c75b055e4665b33ecda873a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-07 11:44:18 +02:00
Lorenz Haas
e3d95168a0 CppEditor: Fix insert position in MoveFuncDefToDecl
When a class was directly assigned to a variable the definition was
misplaced right after the variable.

Task-number: QTCREATORBUG-10303
Change-Id: I2cdfee784b085d856d7ff5ebe62bf791b9a6754e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-07 11:23:41 +02:00
jkobus
3584ce8955 Fix a crash on codestylesettings
Task-number: QTCREATORBUG-10235

Instead of rely on ICodeStylePreferences::destroyed() signal,
when all other objects might be in destruction phase,
clear project code style settings explicitly, when project
closes.

Change-Id: I0dd6675d54c5495d4006acbc9ad12c95f1d0a00c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-07 11:12:34 +02:00
jkobus
2cbb64e0f9 Fix a crash on codestylesettings
Task-number: QTCREATORBUG-10235

Instead of rely on ICodeStylePreferences::destroyed() signal,
when all other objects might be in destruction phase,
clear project code style settings explicitly, when project
closes.

Change-Id: I0dd6675d54c5495d4006acbc9ad12c95f1d0a00c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-07 11:06:43 +02:00
Thiago Macieira
2ad6ba2ad8 Include the correct header for std::lower_bound.
That is <algorithm>. Relying on indirect includes is bad, mmkay?

Change-Id: I245885672004cd406f98c82231aaa38a5cfe464c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-06 20:49:42 +02:00
Orgad Shaneh
1f0cbbc807 Git: Disallow Commit and Push if rebase is in progress
Change-Id: I35a6cf850bccf076d22a73b98b0422663c61b1d3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-05 19:15:17 +02:00
Orgad Shaneh
c07eaa2a25 Git: Move hasRemotes out of panel data
It is input only, and doesn't belong to the panel

Also rename it enablePush

Change-Id: I9d5e2246ce76854a54b02e69980214dd35a402ee
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-10-05 19:15:11 +02:00
Nikolai Kosjar
589d9c7773 CppTools: Rename "Update Code Model" to "Reparse Externally Changed Files"
It was not clear what "Update Code Model" did.

Change-Id: I245307039f8770047b80c7234481099edfe60bc9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-04 17:46:42 +02:00
Eike Ziller
a2615c610e Ios: Enforce linking to CoreFoundation and IOKit
Change-Id: I78bf6623eddf83f4509e14b9e4600360656a0f13
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-10-04 16:07:17 +02:00
Friedemann Kleint
d01ba49036 Fix lupdate-warning about invalid tr()-Usage.
Change-Id: I4601de1996cc988f0c55af169e5c082ad7b02e14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-04 09:57:43 +02:00
Fawzi Mohamed
c39ec1e309 ios: fix compilation with osx 10.6
Change-Id: Id0b28c0aab46237b60756f12be05e3d05df9c9e7
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-04 09:56:54 +02:00
Friedemann Kleint
31b8fbbcbf Fix MSVC-warnings in CppEditor.
cppfollowsymbolundercursor.cpp(174) : warning C4100: 'widget' :
unreferenced parameter

cppvirtualfunctionassistprovider.cpp(61) : warning C4138: '*/' found
outside of comment

Change-Id: I9c14aff54b88daa6eda9a217db2fc314e9f07742
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-04 09:43:41 +02:00
Friedemann Kleint
68d4fbf2a9 Fix lupdate-warning about missing Q_OBJECT in CppIncludeHierarchyModel.
Change-Id: Ieac6d4d741813a14f070b912bdefab843d2f728e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-10-04 09:41:15 +02:00
Nikita Baryshnikov
be95b9f540 Fix connection in analyzerbase
Fix connection to signal activated in analyzerbase plugin,
StartRemoteDialog ctor. Related to
https://codereview.qt-project.org/#change,65357

Change-Id: I23272c41898293390f64d4b6847992b83ad5d93c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-03 13:17:51 +02:00
Orgad Shaneh
82d4afcba9 Git: Cleanup id comparison
Change-Id: I4aefbd9ec900c54a5cdf5ae83519a07f4e768282
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-02 21:52:09 +02:00
Christian Kandeler
79974ac16f CppEditor: Fix build with namespaced Qt.
Change-Id: Id5a2dce79b27c8c4599d7cdc0935064f5db44f13
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
(cherry picked from commit e3fa65f6f3)
2013-10-02 18:26:27 +02:00
Christian Kandeler
9a2a03c1c9 Ios: Fix qbs build.
Change-Id: I7ae7404873210d6c620020834e6bf4815c4187a7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
(cherry picked from commit fdd4f46342)
2013-10-02 18:26:23 +02:00
Eike Ziller
ccf968c05c Ios: Fix compilation with Qt4
Change-Id: I6505d158d2456bc63572e274b47dcef486ca241d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-02 18:18:31 +02:00
Oswald Buddenhagen
44dd2b6bdf fix build against qt4
Change-Id: I1884f6e61dcae95817da10f0ead67f2df99b4ec7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-02 15:49:14 +02:00
Daniel Teske
ef298df4b2 MessageManager: Fix constant broken by 527046acc2
Task-number: QTCREATORBUG-10255
Change-Id: I3d8ffd8441c5bb5f3dc39b1cdbb4e82740e5d4ea
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-02 15:18:59 +02:00
Daniel Teske
71d6b2b10d Android Manifest Editor: Eat keyboard events
And thus prevent them from affecting the wrong widget

Change-Id: Iacf326630a80c2d53e8852ea8055d7bd5f87ed68
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-02 15:16:17 +02:00
Eike Ziller
25f7952f56 More build fixes for OS X
Change-Id: I55a8d4e50d77ff1f11f471931e5ad959f2e946c6
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-02 15:00:22 +02:00
Eike Ziller
2ef111fc8f Fix build on OS X
Change-Id: I753e8d57d4bcf205d83850b440f015743719d409
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-02 14:35:05 +02:00
Orgad Shaneh
ef98345241 Git: Readd shortcuts for commit
Change-Id: I290d2fb265df29c3cce44fae85af2366ac918e99
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-10-02 14:23:54 +02:00
Oswald Buddenhagen
2f936968e7 make the plugin template not create a _dependencies.pri file
it's pointless and counterproductive for 3rd party plugins.

Task-number: QTCREATORBUG-9192
Change-Id: Id9a59e44fa37d00ff5bd68b4240517f0d014c7a2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-02 14:12:40 +02:00
Leena Miettinen
aa20ac35dd Doc: Add iOS to supported target platforms
Reformat the table, as it was becoming too wide.

Change-Id: I6c8a41c812ceb8d3075def936b52c80af904ef27
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-10-02 14:03:04 +02:00
Leena Miettinen
931f08ce10 Doc: connecting iOS devices
Describe Qt Creator support for developing for iOS.

Change-Id: I5d993e343f4f00a09b4c29de6402a338a8011af4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-10-02 14:02:52 +02:00
Oswald Buddenhagen
68609ca8a5 make plugin _dependencies.pri file optional
plugins that cannot be depended upon don't need it.
of course, the project file needs to directly define the respective
variables instead.

this makes it possible to have stand-alone plugins in arbitrarily named
directories.

Change-Id: I166d997bb4db41feac9ffe897cefce382e533bb0
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-10-02 13:57:22 +02:00
David Schulz
d411c07643 C++ Preprocessor additions widget.
Introducing a Widget with a SnippetEditor and a C++ Highlighter which
should provide additional information to the C++ preprocessor for a
specific file.

Change-Id: I27f9498c7e52d1493d6ea92a02a2c6d26130fe07
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-02 13:44:10 +02:00
Petar Perisin
1a8ef7f312 PathChooser - fix handling of predefined path
predefined path was not set when path chooser was set to select files.

Change-Id: I2a9b3d9f2d84b0c5f048bde8e098c6c17772e957
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-02 13:17:33 +02:00
Fawzi Mohamed
8d96ce557e ios: preliminary support for ios
first work in progress support for ios
* separate iosTool using xml communication used for device info and run
* iossim tool to handle the simulator
* debug prepared but not working
* separate gcc toolchain detection fix for simulator

1) add a QT built for ios
2) open a project, for example qtbase/examples/widgets/animation/animatedtiles/animatedtiles.pro
3) build/run...

Change-Id: I7e01604e416338cbe4692dfb34f5d3f31312702d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-02 13:15:49 +02:00
El Mehdi Fekari
3a7d91ca44 Qnx: Fix compile errors
Change-Id: I282f7dce62d9d3d3790716d12cc9e7b040e4f05d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-10-02 12:53:09 +02:00
Daniel Teske
c12e933662 Android: Tweak device list view
Make the incompatible device node expand by default and disable
hopefully all ways a use can collpase. Also remove the arrow from the
title entriues, since it can't be collapsed anymore.

Change-Id: I012c3d9663ac496083f8c16d24eed4cd660d8cd0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-02 12:32:40 +02:00
Daniel Teske
7f8edfb41c AndroidPlugin: Remove dependency on qbs plugin
Task-number: QTCREATORBUG-10288
Change-Id: I2328076a7b5179e4d63becb616433627270089c4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-02 12:29:26 +02:00
Daniel Teske
99f15f1706 ProParser: Plug raw data leak
QProcessEnvironment caches keys, so we must not pass it QStrings created with
fromRawData()

Task-number: QTCREATORBUG-9142
Change-Id: I29fade02f3bc4110fafb1b04d44f2e653951a2ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-10-02 12:14:13 +02:00
Nikolai Kosjar
cd4c4218e4 CppTools: Fix completion in other editor
On duplication of an editor onMimeTypeChanged() of CppToolsEditorSupport
was not triggered, thus not completion provider was set.

Task-number: QTCREATORBUG-10284

Change-Id: Ia1da7f59b19e042f65b068a993f0d5c04b0778e0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-10-02 12:13:31 +02:00
Daniel Teske
c6a8af841a Android: Fix text of Open package checkbox
Change-Id: I781ab9637341c44ab8ba89169f8990b1ca87300f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-02 12:09:06 +02:00
Daniel Teske
bc3b0859bb Android: Set ANDROID_SDK_ROOT environment variable
Needed by androiddeployqt

Task-number: QTCREATORBUG-10289

Change-Id: I64abef7278fab5c9261f9f954af416410f69ce0d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-10-02 12:03:17 +02:00
Nikolai Kosjar
1c5cd2c19a Qnx: Fix build for namespaced Qt
Change-Id: If5987864884526f1740194c65772c0b9cf322b68
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-02 11:54:18 +02:00
Marco Bubke
defcfadd17 QmlDesigner: Add master to component view
Change-Id: I236f78b73b8eea2b780e64d833fdedcfa7d246d1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-02 11:53:15 +02:00
Eike Ziller
0b82b54c24 Remove remaining usages of Qt Quick 1 / Declarative
Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.

Also removes the unused qtcomponents.

qmlpuppet of course still links against declarative, but that's not run
in the same process.

Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-02 11:39:23 +02:00