Commit Graph

38859 Commits

Author SHA1 Message Date
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
Christian Stenger
38c08abde5 ProjectPartBuild: Fix framework paths
Task-number: QTCREATORBUG-13137
Change-Id: I71a222a4048db65db462da07726ea5d6b917da8d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-20 15:06:19 +01:00
Nikolai Kosjar
a21dda3360 QbsProject: Make initial CppTools::ProjectInfo valid
This fixes triggering the QTC_ASSERT in updateCppCompilerCallData() if
the user opens and builds the following qbs project:

    import qbs
    Product {}

Conceptually the initial ProjectInfo should stay invalid, but this would
result in a bigger / more risky change. Will be addressed in master
properly.

Change-Id: I74d3374b438884f38947f551915a80ec836a85c1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-20 14:28:53 +01:00
Christian Kandeler
4b0992568f QmlJS: Fix potential null pointer access.
Change-Id: Ib3e6256343e912a0af4e9618d0f17e1075b94ff0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-20 14:08:49 +01:00
Daniel Teske
99e92dce9b QmakeProject: Fix crash on unloading projects
The QmakeVfs needs to be deleted after all evaluations have been
canceled. Those are canceled in the destructors of the nodes, so
delete the nodes before deleting m_qmakeVfs

Task-number: QTCREATORBUG-13421
Change-Id: I5883f5b2daa6a13ef4facf9b9dccc125a069df94
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-20 13:26:03 +01:00
Daniel Teske
f6a9d01ddf QmakeProject: Fix crash on unloading project while parsing
Callign applyAsyncEvaluate in the desctructor might lead to further
parses, which we don't want. So bail out early in applyAsyncEvaluate.

Task-number: QTCREATORBUG-13421
Change-Id: I776ff477363a3985ebc26e9160c58c2ab9c910b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-20 13:25:42 +01:00
Alex Blasche
7f72b7bf65 Fix broken debugging on Android 5.0
Security permissions prevent access to files not owned by the current
process. This patch replaces the file based handshake protocol with
a local server based implementation. The server waits for QTC to connect
to it and sends back the current process ID. This new mechanism works
on pre 5.0 devices as well.

The existing file based handshake remains and can be activiated via the
env variable QTC_ANDROID_USE_FILE_HANDSHAKE.

Task-number: QTCREATORBUG-13418
Change-Id: Ie40ec801f265a9e13c3220f300798c27abd97ae2
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-20 13:14:09 +01:00
Christian Stenger
dbf663198c Test: Fix valgrind auto test
Change-Id: I6ea9f4d174170b9e430ea77b2337dfdb9971c13c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-20 12:26:18 +01:00
Daniel Teske
15a2555eb7 QmakeProject: Set current Node after first parse
We reuse the m_checkForTemplateUpdate cariable, since this is going
to be reverted in master and replaced by a rework of the current node
handling anyway.

Task-number: QTCREATORBUG-13357
Change-Id: I7deb564219f258753263f3e1473625ce749393fd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:44:12 +01:00
Orgad Shaneh
2e87da2480 Theming: Cache display name in ThemeSettingsWidget
Change-Id: Ia1d4949ab7153ae887ecfa98ab84953c4fb668db
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:35:20 +01:00
Orgad Shaneh
3441594636 Theming: Do not use absolute path for built-in themes
+ always set the global palette and base style on apply

This is required for correctly using the selected theme
with multiple installations of Qt Creator.

Task-number: QTCREATORBUG-13203
Task-number: QTCREATORBUG-13396
Change-Id: I036b96721b6d184dae43d08c5e8bc9e6d1328a7b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:35:16 +01:00
Orgad Shaneh
3ec16fe4d8 Theming: Store initial palette
Change-Id: Iea8b74534a59d8410814f9dd41225b88e1e81f75
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:35:11 +01:00
Eike Ziller
ab83c30f87 Add Qt build date to about dialog
Change-Id: I8fd680ba5436c0b854385910b2977db7b5ebc97a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 09:58:19 +01:00
Leena Miettinen
127fb25d16 Doc: package signing process for Android apps
Task-number: QTCREATORBUG-13429
Change-Id: I4c18c8605f45f84a1b8f5d49c2f3056158e07435
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-20 09:38:48 +01:00
Leena Miettinen
092a924a5b Doc: updated the instructions for writing documentation
Only Qt 5 supported for building docs from 3.3 on.
Added info on using https://tinypng.com to shrink PNG files.

Change-Id: I450c0cf34e34abc54511fef93e8e5caac5ba89ac
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 09:38:23 +01:00
Fawzi Mohamed
9181e06ef2 qmljs: avoid warnings for empty qmltypes files
Change-Id: I5cd29540afa5c7ec1a7031d6e698e873003b3f0a
Task-number: QTCREATORBUG-13354
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-19 21:42:31 +01:00
Alessandro Portale
7ca545a102 A shell script for creating application icons
This script creates several application icon files by using
Inkscape to rasterize .svg items to .png, adding shadows via
imagemagick, creating .ico files via imagemagick and .icns
files via iconutil (OSX only).

Also, this change tweaks applicationicons.svg so that the
shadows won't be cut off.

Change-Id: Ie8adf37d775fa5ea02329451932956f760c17620
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-19 19:54:41 +01:00
Alessandro Portale
b04313e14c Updated Qt Creator application logos
The leaf does not have a white border, anymore. The .ico and
.icns files now have a shadow.

Task-number: QTCREATORBUG-13359
Change-Id: Iebdc6aefb36592333f1d76cd28a407a121318bb6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-19 19:54:01 +01:00
Ulf Hermann
4e3435a5cf Analyzer: Trigger stopIt() only once when pressing the stop button
The stopIt() slot is already connected in the constructor of
AnalyzerRunControl.

The double connection is clearly not intended and, considering that
various analyzers modify internal state from those callse, could lead
to incorrect behavior.

Change-Id: I1c68eb06729849771f4a25257a219c84a032adf3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 18:57:10 +01:00