Commit Graph

31174 Commits

Author SHA1 Message Date
Tobias Hunger
a8d0d93d6c dependencyInfo script: List library dependencies
Change-Id: If595bccab1ebc16d894cf703cccedd7957b78edc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-28 15:50:36 +02:00
Daniel Teske
60cd9882f0 Android Permission update
Task-number: QTCREATORBUG-9277

Change-Id: I2c52b4ad66e2c04f427c2bfdc0bde4df55cefd96
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-05-28 15:26:05 +02:00
Daniel Teske
8f58aaf94e MiniProjectTargetSelector: Implement Esc shortcut override
Task-number: QTCREATORBUG-9366

Change-Id: Ic70f3dc63046aafd7de0951395d80c5d7206ef43
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-28 15:25:52 +02:00
Kai Koehne
acf72893c4 Debugger: Don't check for QML language before project is parsed
Checking for QMLJS in the ctor of the aspect always returns false
for qt4project, since the project hasn't been parsed yet.

Change-Id: I41ce057bda4a1f2cb700e655645eae627990f3be
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 13:59:26 +02:00
Kai Koehne
33659ebf98 QmlProject: Unify use of constants
Change-Id: I7397eb12f46e1c0a175b6bcec794b3e8ad1cb19a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 13:59:20 +02:00
Kai Koehne
17539d670f Revert "Project: Set QML/C++ languages where both are possible"
This reverts commit 75691393ec. Otherwise
we'd enable QML debugging for virtually all projects.

Change-Id: I5518624a9973a9f61fbef6c680b5a83c74d0b4a9
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 13:59:16 +02:00
hjk
16c2c96cba Debugger: Make std::... dumpers work on Mac again
GDB seems to report types names with spurious single quotes
which then made tests for dumper availability fail.

Change-Id: Iaa3e6b92503a2b9553432568c2047c28899c7ea6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-28 13:43:41 +02:00
hjk
38e98e60d5 Debugger: Fix typo when checking versions
Change-Id: Ic24e7f26228b4f1bc1e7ab3627e86036396584ed
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-28 13:12:16 +02:00
Christian Stenger
867068c479 Squish: Fix tst_modify_readonly
Change-Id: I31b7624ecab6d2d03c5ec6bd36e790a222c1deaa
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-28 12:58:09 +02:00
hjk
22c5d99fcb Debugger: Disable some commands on Mac
Version of gdb < 7.4 means we are on Mac, so we can
disable commands that have known results there.

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf83e97661204d4f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-28 12:38:10 +02:00
hjk
af69f732f1 Debugger: Hard-code version dependency of m_dissembleUsesComma
We don't support GDB in the range 7.0...7.3 anymore where the
outcome was unsure.

Change-Id: I1ce76f5c4b1febe45c4a3b6404208fed7d9c6868
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-28 12:37:27 +02:00
hjk
91ba674db4 Debugger: Remove workaround for gdb-7.1 bug
See sourceware.org/bugzilla/show_bug.cgi?id=12023.
The workaround can cause hickups in the output parser
of Mac gdb, as the error message is scattered within
regular output without any markup.

Change-Id: I835133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-28 12:37:02 +02:00
Robert Loehning
3b46f64272 Squish: Updated handleDebuggerWarnings()
Change-Id: Id5129e6797b945c16ecafad92f0d00bd0edeb3cd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-28 12:10:32 +02:00
Petar Perisin
beac53ad8d Gerrit - use new diff editor for diff
Change-Id: I7ba84491a5f6796ff446c2e21487ed4c04441b82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 10:25:26 +02:00
Oswald Buddenhagen
3729f4aa31 make stubs for dangerous/useless qmake functions in limited mode
instead of having them "not implemented" (and consequently getting
errors), just let requires(), system(), mkpath(), write_file(), touch()
and cache() do nothing. this is likely to cause followup failures which
are harder to detect, but the amount of scary noise we are producing now
is not really acceptable. furthermore, in qtcreator these failures
actually terminate the "precise" evaluation, which breaks Run
Configurations.

Task-number: QTBUG-28159 (in different repo)
Task-number: QTCREATORBUG-8550
Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/94ab2efb2d155d3c1ca7b91c1daf443a149bcf1f)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-28 10:10:22 +02:00
Oswald Buddenhagen
314126cc75 fix auto-generated version info in .pluginspec files
we need to include qtcreator.pri before calculating $$dependencyList, as
that's where the version comes from.

this also has the side effect that the "real" dependency resolution in
qtcreator.pri gets "clean" input - not that it would actually matter.

Change-Id: Ibb91c569c8e05b0e45214e7e84aee8ff3316bf5d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-28 10:09:50 +02:00
Orgad Shaneh
e9f901be15 Git: Don't pop VCS pane on stage
The command is appended anyway, and it usually produces no output
to stdout

Change-Id: Ie5f685b090ead8a0e888c9c0cfa6db2411e91f33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 10:02:43 +02:00
David Schulz
bdaac93fa8 Debugger: Fix crash in cdboptionspage.
Change-Id: I467b6c2bfb39f903b01f80dd83a215b926d109df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-28 09:01:26 +02:00
hjk
79438adfcd TextEditor: Simplify HighlightDefinitionMetaData structure
It's a plain value struct.

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d40
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-28 08:54:09 +02:00
David Schulz
92a15600a4 Debugger: Add options page for cdb paths.
Change-Id: Iafb5fd88c101e716f538edc44113d21a880f2d3f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-28 08:25:16 +02:00
Christian Kandeler
24e81241a5 Remove duplicate module dependencies from qbs files.
These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-27 17:59:12 +02:00
J-P Nurmi
97952cfde2 Add missing QtQuick.Controls/Dialogs/Layouts type descriptions
Task-number: QTBUG-31012
Change-Id: Ic19cc79faaa71a09724445cf961ec16cf16fcbb4
(cherry picked from commit 4dd4bff886)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-05-27 17:57:36 +02:00
Orgad Shaneh
5374a4f3cd Git: Use OtherContent type for commit
Change-Id: Ic0d31a1131f559d1dfa2c880d72c68720d378d1f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 17:55:10 +02:00
Orgad Shaneh
64fe884bbc VCS: Fix tests
Some editors were removed, adapt indices

Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 17:45:32 +02:00
Eike Ziller
d08ad0038d Merge remote-tracking branch 'origin/2.8' 2013-05-27 17:21:01 +02:00
Eike Ziller
5b648d8b6e Revert "Android: Disable QML Debugging"
Was temporarily disabled for 2.7 and not supposed to be merged into 2.8
This reverts commit d3e69915da.

Conflicts:
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I669d587535545846b5fcbdadd0d066f1758a3644
2013-05-27 17:19:21 +02:00
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
Victor Ostashevsky
2074de74d0 Ukrainian translation update
Change-Id: I8c9bb5bfaac4296fb9089fb3c1e87df2b55afa9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-27 17:11:13 +02:00
Tobias Hunger
116db445bf Qbs: Be more paranoid when setting the log level
Change-Id: I134c6eefeff285ed8953c7b35c249ea757692c34
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 16:31:07 +02:00
Leena Miettinen
c93c699a5e Doc: selecting run environment in run settings
Change-Id: I02f2bc70733e03b9b340c37019fef5d6a7af6872
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 16:23:48 +02:00
Tobias Hunger
c3b6721a60 PNG: Fix warning about sRGB information
libpng 1.6 prints a line warning about this whenever loading any
of these files.

Remove color mangement related sections as well as time information
from the PNG files using:

pngcrush -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem time -force -ow FileName

PNGcrush is losslessly recompressing the files, too.

Change-Id: I483dfb98414c4914840bd5ee9318153a599747b1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 16:12:01 +02:00
Tobias Hunger
27e4fe5a23 Qbs: Fix qbs build syntax
Change-Id: Ifbfc128b3785941d0c6ec1789f1c85d2c602738a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 16:03:03 +02:00
hjk
78cea9ee24 Debugger: Make kit parameter in fillParameters() non-optional
Change-Id: I1b4dde1a63c8e2eb030cab3580abed845b270631
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 15:34:47 +02:00
Eike Ziller
2345fa35a7 Fix build.
Change-Id: I8b7c423cd77e0f0aba89dcf1a397248a0edc0cf1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-27 15:18:30 +02:00
David Schulz
a36a6fc640 Utils: Add PathListEditor to supprted widgets in SavedAction.
Change-Id: I813cf76d2df45daf0c981f3d136caebb96d03cf5
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-27 14:57:05 +02:00
David Schulz
87e516fa71 Debugger: Add core function returning string list settings.
Change-Id: I03caaf59bf6d41845b3f68194701579d7383e638
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 14:42:28 +02:00
hjk
73f63bf8f0 Editors: Provide a base implementation for {save,restore}State
Change-Id: Iedfc0d59ecfe257ad5823cff39977bce82ada3a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 14:40:42 +02:00
David Schulz
c4f16f6257 Debugger: Fix unused warning in procinterrupt
Change-Id: I9173f4040783460ba3b520b1a39a461de8283f21
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-27 14:34:02 +02:00
hjk
daad8e238e Editors: Provide a base implementation for duplicate{,Supported}
Helps avoiding trivial re-implementations.

Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 14:27:16 +02:00
Eike Ziller
8e50dc182c Remember progress details pinned state and default to "pinned".
Making the default "pinned" will hopefully make people realize earlier
that the progress information has moved to the new location.

Change-Id: I5dbb3cae3680f724369b1a025cf38c5317a29fd0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 14:23:43 +02:00
Tobias Hunger
a52063ee39 Projects: Improve opening of projects
Move logic to detect already open projects into ProjectExplorer itself,
along with some check for the canonicalFilePath.

Remove the same logic from the individual projectmanagers.

Put check that the path is a file into project managers. So far all of
them assume the project file to be a file (e.g. a xcode project manager
would expect a directory though).

Task-number: QTCREATORBUG-9350
Change-Id: I3901958395e3c594c8cfba9a85dc7d3ec3334afb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-27 13:16:50 +02:00
hjk
711e67ad65 Debugger: Pass more options down to LLDB variable formatting
Change-Id: I18487bafeafe81a473e9b11945a20258c8b2b676
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 13:14:25 +02:00
Tobias Hunger
b00ba63546 Qbs: Flush parsers when all qbs output is processed
This prevents parts of gcc error messages from getting lost.

Task-number: QTCREATORBUG-9351
Change-Id: I5dd209194eac6606cd76aaea16e43f66f3ec52fa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-27 13:01:53 +02:00
hjk
4ae9f3778f Debugger: Fix passing connection when starting from commandline
This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 13:01:20 +02:00
Tobias Hunger
e3445011bc Qbs: Make sure a fresh QbsBuildStep has a configuration
Task-number: QTCREATOR-9355

Change-Id: I36b77a95300fc1574c2e5bebb57722e6b3cb433a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 12:51:01 +02:00
hjk
c17a497f64 ImageViewer: De-pimpl ImageViewerFile
Change-Id: I418394a106deac682b8c4ce6e8ecaac28324386d
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 11:41:15 +02:00
hjk
c0d3e51960 Core: Use Id as values in ActionContainer
Less noise, less cycles.

Change-Id: I5c924362bc3cce37f9fc63fe18479083b6a6acbf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 11:24:46 +02:00
Daniel Teske
d477a43548 SessionManager: Ask the user before deleting a sesion.
Task-number: QTCREATORBUG-9272
Change-Id: I636be81544cf114405fbf70e4ee5724c4fd43685
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 11:18:42 +02:00
Orgad Shaneh
b75cf96868 Git: Refactor stash handling
* Replace RebaseManager with ConflictHandler
* Store StashGuard in GitClient, allow popping after
  a whole process is done (e.g. pull with resolved conflicts)

Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 10:43:44 +02:00
Aurindam Jana
122bd50144 Debugger: Check start parameter languages for engine type
Change-Id: If5a05d12e7597516510d5726ca6d3418b3393251
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-27 10:21:34 +02:00