Commit Graph

38877 Commits

Author SHA1 Message Date
hjk
cf09ac882c Perforce: Don't crash on large log output
Change-Id: I3766d20f5faaa01f38418cdfdcc4977cf9189fc7
Reviewed-by: Cristian Adam <cristian.adam@here.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 12:57:45 +01:00
Eike Ziller
4bfe6f9327 Revert "ToolChains: Do not list ToolChains removed by the sdktool"
Obviously the patch removes too much.
This reverts commit 9a5f81d96f.

Change-Id: Id6f128a8d72b51d0d1701a0a82377b56e2a314b2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 12:30:10 +01:00
Daniel Teske
9b27c9b9f1 Android: Fix name for api level 20
Change-Id: I21ec1294c090966b59d556992f45b5be4615cb20
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-25 11:58:23 +01:00
Eike Ziller
dcb00b00dd Extending Doc: Add warning about what the Qt Creator plugin wizard creates
Because we do not guarantee any source or binary compatibility,
you should use the Qt Creator version that you want to develop for
to create the plugin

Change-Id: I747653f8bbd3df9cc82af7fac67abcf14e786241
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-11-25 11:23:22 +01:00
Leena Miettinen
09bfbf70e8 Doc: update info about other build systems than qmake
Change-Id: Ie836c97bd6b87e9122b5d9f7be1f078ebbca4d8b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-25 11:09:31 +01:00
Fawzi Mohamed
9c3f5dd3a4 qmljs: avoid storing qmltypes and qmlproject
qmltypes files were stored in the snapshot during scan, this is wrong
and bloats the memory usage.

Task-number: QTCREATORBUG-13369
Change-Id: Ie8c3970ad7a8d732230f3dc73a9ba65ab62ea4e9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 11:05:47 +01:00
hjk
3027bcc952 Ssh: Remove wrong Q_ASSERT in SshRemoteProcess destructor
This can be triggered rather quickly by clicking "Run" for a short-
lived application on a QNX device. The state in this situation is
QSsh::Internal::AbstractSshChannel::SessionRequested.

Change-Id: I4447b85a4e8d6ba63e30f3783d29bb0c816e0dff
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-25 10:44:52 +01:00
Kai Koehne
50c5df25bb Doc: Improve description of "Qt mkspec" field
The mkspec is a global configuration for qmake, not a 'build instruction'.
For people new to qmake, and build systems in general, it might be arguably
a bit hard to grasp what an mkspec is (the qmake documentation doesn't
explain it apparently, either). Still, this is probably not the right
place to go much more into details ...

Change-Id: I80aa5fb9e4751242dd2570613951f2e1387c4433
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-11-25 10:43:29 +01:00
Orgad Shaneh
d855afad44 ElfReader: Catch bad_alloc exception
Might happen on file.readAll() for large elf files.

Change-Id: Id338e647d2d0903d2071b5f35ffc7a00e6aca24d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 09:51:42 +01:00
Tobias Hunger
9a5f81d96f ToolChains: Do not list ToolChains removed by the sdktool
Remove ToolChains removed by the sdktool from user settings. This
prevents them from being created again.

Task-number: QTCREATORBUG-12751
Change-Id: I61b77acb6ab12815d3b09bd766ba44301c517aed
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-24 15:25:31 +01:00
Orgad Shaneh
8f68b7ccba Utils: Fix memory leak in JsonMemoryPool
objects are freed, but their dtors are not called...

Detected by valgrind

Change-Id: Iec8d78c205e9b2722ee5a89941df96c3383b385b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-24 14:44:50 +01:00
Topi Reinio
1679c07e74 Doc: Prepare Qt Creator manual for the qt.io online style
- Add a copyright notice (required for projects external
    to Qt in the new template)
  - Add an .html file with sidebar content

Change-Id: I2c9d965698aa2d2ed01426510b16916ed4fef8cf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-11-24 14:41:20 +01:00
Nikolai Kosjar
2f3e8c7981 CppTools: Remove QTC_ASSERT
A DiffEditorDocument has an empty file path.

Change-Id: If097497514afa82b1ed220a37cae410f4a81aa9a
Task-number: QTCREATORBUG-13489
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2014-11-24 13:28:58 +01:00
Orgad Shaneh
1b461bead2 Valgrind: Fix memory leak
Detected by valgrind :)

Change-Id: I4e6b9cb1980cce82170e3f6c2e7cb541dd838d5e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-11-24 13:22:03 +01:00
Daniel Teske
a4a4f7a475 ProjectExplorer: Fix disabled "Close Project" after closing project
The close project action is special. If there are multiple projects open
we show a menu with individual actions per project. If only one project
is open, we show one the "m_unloadAction". Even with only one project
open, the current project might be null. So explicitly manage enabled
the same way as visible. And also us the displayName of the startup
project, since that is guranteed to be non-null if there's a project
open.

Task-number: QTCREATORBUG-13497
Change-Id: I9150568da162c58ee524c2b954e0b9a816f79d7c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-24 12:45:10 +01:00
Daniel Teske
5449e0a731 SettingsDialog: Fix default button
The default button would move to the first pushbutton that got focus.
E.g. tabbing through the android settings would move the default button
to the first button that got focus.

The cause of that is that for QPushButton::setDefault to work, the
button needs to be a child of the QDialog. So call it after adding
the buttongroup to the layout.

Change-Id: Ife35bf15aa8585f7931a87ee715f316bb02b36be
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-24 11:48:42 +01:00
Leena Miettinen
0d9b254840 Doc: remove support for building docs with Qt 4
The templates are fetched from qtbase/doc/global

Change-Id: I15386a66e1dae552f5637062d9f176bf6565a834
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-11-24 09:48:26 +01:00
Eike Ziller
c4971b6eff OS X: Add background image to installer and update images
"Watermark" is not available on OS X
We have a new logo now

Task-number: QTCREATORBUG-13482
Change-Id: I01fdfb958bc67660a87a2c5a18f88613e7121aff
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-24 09:03:15 +01:00
Eskil Abrahamsen Blomfeldt
ed2e963a15 Android: Fix deployment of release builds with Qt 5.3 and earlier
Since unsigned packages are not deployable, we always make
packages signed with the debug key when there's no signing requested,
even if the native code is built as release. This was already
fixed for Qt 5.4, where we use androiddeployqt to deploy the apk,
but for earlier versions, we need to use the correct apk name.
We also need to use the apk name which is used by androiddeployqt
in Qt 5.3, which does not contain the "-signed" suffix.

Change-Id: I87f7936002946acd80bc245935c44cf148f9630d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-24 08:34:19 +01:00
hjk
cb30a1ae10 ProjectExplorer: Compile fix after 78f1b24c
Change-Id: I6e106d4ae20b0c26acbb1f2257c59dea0498f623
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-21 18:01:56 +01:00
Tobias Hunger
fa223ab65b JsonWizard: Add separate method to get stringified values
Have value(...) return a QVariant that is never mangeled and add
a stringValue(...) method to retrieve stringified values. It is
way easier to see who needs what now.

Use this consistently in the JsonWizard and fix one place where
a QVariant was expected but a stringified version was returned.

Task-number: QTCREATORBUG-13486
Change-Id: I2c4e9188280940e529f0f60bcc18b9b7330865d1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-21 17:25:12 +01:00
Tobias Hunger
78f1b24cd4 JsonKitsPage: Clarify unexpanded/expanded project path
Change-Id: I62a04582d29b122f6210b3bcef0d3e5e26d5286e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-21 17:25:07 +01:00
Daniel Teske
d295b304d1 Android Settings Dialog: Fix tab order
Task-number: QTCREATORBUG-13484
Change-Id: I1d63ceb485a0bde87010f86dce540c4c37da8b48
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-21 17:24:00 +01:00
hjk
1a1ec50801 Debugger: Adjust std::vector<bool> dumper autotest for recent Clang
Change-Id: I1998f0750c5905a3dc4e83db297edc135cd2a39a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-21 15:12:11 +01:00
hjk
20675704c6 Debugger: Add ability to check for clang version in tests
Change-Id: Ie56de7a0e59cadd8557f7a2fd00d434470000f3c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-21 15:12:04 +01:00
Orgad Shaneh
5ad01800a3 Core: Fix memory leak
Detected by valgrind

Change-Id: Iae3845edfcf1933c90b6b20b6af3909324ceb6fe
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-21 13:59:41 +01:00
Daniel Teske
92fbbaea9b BaseQtVersion: Rename isInSourceDirectory to isSubProject and fix it
The source and examples directory is not a sub directory of the qt
source directory in the sdks. But we still want to treat it as part
of a the matching qt.

Task-number: QTCREATORBUG-13469
Change-Id: Ib63722052a14c29e4198c879dd770fb4ecdcdb80
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-21 13:55:50 +01:00
Tobias Hunger
9b5f558bf2 SVN: Fix checkout wizard
Task-number: QTCREATORBUG-13457
Change-Id: Ib328678de18e1ae7160aaa1035356a62413b2efb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-21 12:51:39 +01:00
Leena Miettinen
4c119b985a Doc: update accelbubble example source file
To reflect changes in the template.
Hide license header from the docs.

Change-Id: Ib703f5a8c17ef210a14c684caa8ba9ecf8936839
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-21 12:22:04 +01:00
Leena Miettinen
c68ffc7c8e Doc: replace Text type with Label type
Because the templates were changed.

Change-Id: Ib64f65d1735604ad0c54addc2c7d1ce850ca08a8
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-21 12:21:47 +01:00
Orgad Shaneh
b3fb45368a QbsPM: Fix memory leaks
Detected by valgrind

Change-Id: I32008cb91b5b814f67896ad1efb08f1366a38c76
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-21 12:15:54 +01:00
Leena Miettinen
f3a3016501 Doc: remove built-in from theme names
The string was hidden in the UI. This needs to come back
when the condition changes again.

Change-Id: I096fdbe0ff15f9dbaa7fb04a0dbb6271fab87315
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-21 12:08:25 +01:00
Orgad Shaneh
486aac4556 PluginManager: Fix potential leak
Detected by valgrind

Change-Id: Id8de8e8f5e3f4e691be818ff0224676345227156
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-21 11:34:16 +01:00
Ulf Hermann
3d9c38f3ca QmlProfiler: use correct row heights for binding loop markers
Change-Id: Id476d9be7c0b1a4fb7c8e5fffb2861441d369316
Task-number: QTCREATORBUG-13451
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-21 11:09:48 +01:00
Orgad Shaneh
772ca7a654 QmlProfiler: Fix memory leak
Detected by valgrind

Change-Id: I505e8dec83a0c9d3be648e43d9886debeb2a5b3b
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2014-11-21 10:46:12 +01:00
Orgad Shaneh
09e59c585d Theming: Do not append (built-in) to themes
In 3.3 only built-in themes are supported...

Change-Id: I7236c799c0f44059e808b160b8cc7519769f9470
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2014-11-21 09:51:55 +01:00
Friedemann Kleint
d3dd264c37 Resource editor: Fix paste.
Add a "plainText" property to the resource editor's document
similar to the diff editor (see
f268d0f8e1 ).

Task-number: QTCREATORBUG-13458
Change-Id: Icd11134432f796b37090a16bbaa13f075fa8c2bd
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-20 19:33:45 +01:00
Tobias Hunger
de34e0e30b FormWizard: Fix newlines being escaped in generated output
Export the form contents as a list of lines and join them when
needed instead of hoping to unescape '\\n' in all places where
it is necessary.

This approach should be a bit saver since it will cause parse
errors in the wizard, which are more visible than broken output
in the generated files.

Task-number: QTCREATORBUG-13456
Change-Id: I434a9227082f92be3c2ce75006f61ac79a2b6fd6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 18:11:47 +01:00
Ulf Hermann
3382efb71e QmlProfiler: Center the binding loop marker on events in overview
Change-Id: If16ee4335b40e6ee611f04032246620ecf29f2db
Task-number: QTCREATORBUG-13453
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-20 17:29:58 +01:00
Daniel Teske
c35a3ab344 Android: Don't default to gradle
There are numerous problems with gradle, so for now switch the default
to off.

Task-number: QTCREATORBUG-13470
Change-Id: I9d2fc216c91656a528875a0bc3b820d4f289b9b0
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-20 17:18:41 +01:00
Leena Miettinen
8915a619a3 Doc: Paste Clipboard command was removed
The Paste Snippet command can be used instead.

Change-Id: I96dd2628f000a11741fd52e291bc2b2e6a51f6a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2014-11-20 17:08:31 +01:00
Kai Koehne
2c8bc2700e Fix license headers
Change-Id: I810aa2d98c96040fd536ae0711041f301e5c22d7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 16:58:22 +01:00
Daniel Teske
049f2dd35c CMake: Add logging output to file -> target mapping
The logic for mapping files to targets is a heuristic, and a pretty bad
one. Add some logging output, which can be enabled by setting the env
variable QT_LOGGING_RULES to
qtc.cmakeprojectmanager.filetargetmapping.debug=true . This will allow
easier debugging of problematic cases.

Change-Id: I17086a30beb8962333109fce9198edde4540d169
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:30:42 +01:00
Daniel Teske
0390ece761 CMake: Further fine tune file -> target mapping
Instead of requiring that the target's source directory is a parent of
all source files, use a distance between the source and directory and
the file. This will find the wrong CMakeLists.txt in more cases but also
is much more likely to lead to using the fallback target.

This makes code completion work for http://github.com/dream3d/dream3d/

Change-Id: Ic035454c5eabe361bc7c46bd943e9a9cdee730e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:30:38 +01:00
Daniel Teske
f88ad0ce42 CMake: Fine tune finding a suitable targets for files
Ignore targets that have no include directories, those are in general
not targets that are very useful.

Change-Id: I1cd1f7dffc73eace2f7a0897bc15dea7e6bc5fee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:30:34 +01:00
Orgad Shaneh
8455efa2ec Theming: Hide the buttons in the theme selector
They are not supported in 3.3.

Change-Id: Iecd52e4273b9b9f5855df37e28739135f1725a2b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2014-11-20 16:25:42 +01:00
Tobias Hunger
682dd3d5ce QtKitInformation: Report correct version Id
We try hard to find the correct version, but then forget to report
that back before continuing to find a weaker match.

Change-Id: I824194fe4d13db04eba488268165b27c033d33bf
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-20 16:16:43 +01:00
Tobias Hunger
4fefe0c202 JsonWizard: Code cleanup
Make sure project is 0, clang reports a free after use otherwise.

Clean up the code a bit.

Change-Id: Ie21cc83c589fdc5eed197bd3f005b309c000cc0d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-20 16:16:35 +01:00
Daniel Teske
6a8349c9d5 JsonSummaryPage: Fix selection of best project node
Broke in 7db9c37b2d, which accidently
resulted in passing in a empty list to initializeProjectTree

Task-number: QTCREATORBUG-13406
Change-Id: I24aa52fef0eaebb335624f8e31cd05778a2da6a2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:16:26 +01:00
Eike Ziller
d52bb24e39 Revert "Add Qt build date to about dialog"
For whatever reason that only worked for local builds,
but not the packages.
This reverts commit ab83c30f87.

Change-Id: I8225e1bdd22489b619ce546ecccba420424f9880
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-11-20 16:06:52 +01:00