Commit Graph

3443 Commits

Author SHA1 Message Date
Yuchen Deng
2cfd14f63e CMake: Fix typo
Change-Id: I825ea33d2ee965bffb7611e51ac88bd79e4cc491
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-01 12:20:31 +01:00
Yuchen Deng
04e267b482 CMake: Don't save entry if CMake exited with errors
Change-Id: Ife98b33c3269a452187c957bd5579722b3ae4018
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-01 12:19:25 +01:00
Yuchen Deng
75d1c3035a CMake: Add option for preferred Ninja user
Change-Id: I5a3aa31db7fa37f31a4b557eb5b09b7987169265
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-28 16:14:01 +01:00
Stanislav Ionascu
ab8878fdd1 CMake: Display all targets in project settings
All targets should be displayed, even without
binary artifacts, otherwise it's not possible
to select a CMake custom target to build.

Change-Id: I4b7640f460a248fd2d4b56428c2c8da3b13b9103
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
2013-02-27 21:02:05 +01:00
Daniel Teske
fc867d5daf CMakeOpenProjectWizard: Warn the user if no kit is available
And allow the user to configure kits before proceding.

Change-Id: I6acf2bcc05d53b0ac9d448599d29d2fe02ae1349
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-21 13:33:26 +01:00
Aurindam Jana
5cf11e2bbd Qml Debugging: Default option for Qt Quick application
Qt Quick applications should have Qml Debugging enabled
by default.

Task-number: QTCREATORBUG-8208
Change-Id: I794249567b15071098f0ac8ba5f2a8e5f2be4ffb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-20 21:03:23 +01:00
Daniel Teske
ae8fb83385 CMake MakeStep: Fix crash after building
Task-number: QTCREATORBUG-8802

Change-Id: I88253caf5f70bed95454f36794f7256a74a165a7
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 13:34:02 +01:00
Tobias Hunger
0e476316f0 CMake: Fix progress reporting on makestep
Change-Id: I0588949283f45ca46b0f52875342605659ddea89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 11:48:47 +01:00
Tobias Hunger
f8782696c5 CMake: Fix string
Those really are targets, not kits:-)

Change-Id: Idb233b2ca0546589c087c4f6a53fb113fa4d793c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-15 17:08:02 +01:00
Tobias Hunger
cd1a3350a2 CMake: Fix crash when building a cmake project
Reported by Loaden via mail.

Change-Id: I21a9f2ee5787d9271d20f9ed65786d8c7be08d3c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-15 17:07:41 +01:00
Daniel Teske
5c653f40a3 CMakeOpenProjectWizard: The user needs to always select a kit
So check that in isComplete() and prevent a crash.

Task-number: QTCREATORBUG-8717
Change-Id: Ib485941534a4f0f3aa4e791fdb655eb9061ba9fa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 14:47:52 +01:00
Daniel Teske
ca8df404d9 CMakeOpenProjectWizard: Rename misnamed variable
Change-Id: Ib8836483fa1f7fdf3af4063b25a7940ae07080a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 14:47:44 +01:00
Tobias Hunger
962ba86d0f AbstractProcessStep: Do not run a qprocess in a thread
This avoids sending signals for new tasks and process output
via the gui thread's event loop. When finding lots of issues in
the output we generate so many events that any attempt to
compress events takes a long time (max. events waiting to be
processed were > 1200000 when doing a clang -Weverything build!),
and thus the UI freezes.

Change-Id: I9668d2537b1a268e788cd0ea5c756ebaab4462a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-12 18:31:28 +01:00
Leena Miettinen
1bfe9488f0 UI text: fix capitalization of CMake
Change-Id: I2d45f123936bb53a2659b6e96afc9073ab2b140c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-12 16:37:32 +01:00
David Schulz
45b021331e Editor: Renaming Link members.
Change-Id: I1ae21152ee7b8e2a9323322575de23d77c260c72
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-11 16:00:52 +01:00
Robert Loehning
b31432ea08 String fix
Change-Id: I1e735c3caa617e5255caa55c2dab2ade61ec5989
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 14:33:19 +01:00
Yuchen Deng
86075a8f0e Get the correct CMake Version
Change-Id: Ie5443c31ecf8dd7644303f5e5a2f9885a33bf3a7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:25:08 +01:00
Yuchen Deng
bc1977d238 CMake: Select arguments text for easy editing
Change-Id: I416a35a773792a1aee17811c022820262eb7f23e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:24:04 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-01 09:19:26 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Tobias Hunger
54d0f91b94 Qt4BuildConfiguration: Allow for "Release" and "Debug" BCs
No longer require some text additional text.

Change-Id: I0bc1f64e6cbc9577cd4d79e04ce95b24a614ac7f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-31 12:17:03 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Friedemann Kleint
8bb0134c50 tr()-Fixes: Fix translation contexts.
Change-Id: Ic043a097947a80e2fb5cb381c585375c4e5f5eef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-29 13:58:36 +01:00
Tobias Hunger
7a70b4f135 LocalApplicationRC: Rename files to localapplicationrunconfiguration.(h|cpp)
I ran once too often into them being called applicationrunconfiguration.(h|cpp)!

Change-Id: I280a3280173b80d4d955faddedf11688786eee14
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 14:46:47 +01:00
hjk
baffa492d9 Core: simplify ILocator interface
Use data members instead of virtual functions for id, displayName and
priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator.

Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-18 15:51:13 +01:00
Daniel Teske
66bc398183 CMake: Fix build directory for "Add Buildconfiguration"
Task-number: QTCREATORBUG-8425

Change-Id: I58a47895fa882bcc53cad1ef764a307c714f2a1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-17 16:54:45 +01:00
hjk
be48a3faff Use Core::Id for IOptionsPage::m_id
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 11:43:04 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Orgad Shaneh
a4c34dc7de InfoBar: Introduce global suppression
* Generalize "Do not show again"
* Use in CMakeEditor

Change-Id: Ia86b7c79b9022cbfcd06fed02b94fe0b15c87a56
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-11 08:10:43 +01:00
Daniel Teske
20cfccd753 Figure out compile flags for cmake by parsing flags.make files
Change-Id: I4dc3889fcc5b26e24b29a3a9fdbba37ddcb74a95
Note: This parses the first flags.make file that is found.
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 17:45:54 +01:00
Daniel Teske
b2ee2d675f CMakeRunConfiguration: Emit baseEnvironmentChanged if the bc changed
If the CMakeRunConfiguration environment is based on the bc environment
then we need to emit this signal on changing the bc or if the
environment of the bc changed.

Change-Id: I005dfa06c92b89f5cf8b901c0f5d929fd8e1bf70
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-09 13:27:10 +01:00
Orgad Shaneh
d3302d83a6 CMakeEditor: Replace member var with InfoBar call
This changes behavior. Editing a cmake file then building then editing
it again will display the warning again. It currently doesn't.

Change-Id: I8ecb31956102680e953a40dcb5e95bde819aa652
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-09 11:43:24 +01:00
Daniel Teske
68b9966bf2 Fix .ui code completion for some cmake projects
CMake generates the ui*h file in the directory that corresponds to the
CMakeLists.txt. Creator does not have the information whihch
CMakeLists.txt file includes the .ui file. This patch adds a crude
heuristic that searches for the right CMakeLists.txt.

Task-number: QTCREATORBUG-8509
Change-Id: I0f31d9766c6b5988a00ab618026ea052690dd649
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-09 11:38:39 +01:00
Debao Zhang
4a32f1d821 use QSharedPointer instead of QRefCountPointer
Change-Id: Ie670448bf924e02720eae6db33f2a346e8ac0001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-01-09 08:59:28 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Daniel Teske
f320426cd1 Use C++11 parsing mode for CMake, AutoTools and Generic project managers
Those 3 project managers can't easily figure out the right mode for code
parsing. The code we are parsing is predominantly C++98 code. But for
those using C++98 toolchains having valid C++11 code not be marked as a
error is probably not much of a problem, whereas the reverse, using a
C++11 toolchain and having valid code being marked as a error is
annoying.

Change-Id: I8dcc172029045cf591b3ba0adef1585f3f94fd39
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-01 15:19:43 +01:00
hjk
78beacd7b4 Use Core::Id for IOptionPage::category
Change-Id: I63433edd9118a7aa4ecaef28f40bfc729d90f512
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-29 19:10:59 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
2012-12-18 17:42:04 +01:00
Daniel Teske
2ebb4081fb CMake: Fix working directory of runconfigurations
On updating the working directory ensure that changes triggered from
the cmakerunconfiguration are not interpreted as the user changing.

Task-number: QTCREATORBUG-8426
Change-Id: Ibe6d026d864e1af48b01b5c81db9ad7c7fb6be2b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-12-17 13:51:59 +01:00
Daniel Teske
2f862681d7 ProcessParameter: Ensure macro expansion is done in the main thread
The macro expanders are not thread safe. Also the values should be
expanded in init() as later changes to e.g. the buildconfiguration
should not affect the build anymore.

Change-Id: I82f5cd229d82cdb9f897c1db69c47b028cca29d1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-12-07 13:43:09 +01:00
Daniel Teske
50417fd92a CMakeBuildConfiguration: Remove unecessary virtual
It's the coding style and this makes it consistent in this file

Change-Id: I6d99651eea2ffc161ecf3efc50a1ed71eaf67aa0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-28 17:40:27 +01:00
Erik Verbruggen
964c01a460 C++: ProjectParts now contain everything that gets linked together.
Change-Id: Ib862e51897156a03a4a45e2a1690b00caeb03518
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-28 09:09:14 +01:00
Eike Ziller
387f5a7006 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
2012-11-26 10:52:28 +01:00
Orgad Shaneh
f8645bb6c7 Translate some strings
Change-Id: I5eab1edbca591cc36813cd862d6ad93875b51a3c
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-26 09:47:14 +01:00
hjk
cd7f8706e8 cmake: compile fix after QT_NO_CAST
Change-Id: Ia289d7cded868200f2894178ac725d11bb90783a
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-23 14:08:37 +01:00
Orgad Shaneh
862629c57a CMake: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I23134b7eef222dcdb3425e2f2f6d62ab863009fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-23 11:52:11 +01:00
Tobias Hunger
634ab62870 Fix build issues being empty for non-qmake projects
In qmake based projects we override LC_ALL to make sure the parsers
do not fail to extract build issues from the compiler output.

Do the same for the other build systems.

Task-number: QTCREATORBUG-5097
Change-Id: I75830c362a736df42a0500c889c3c42e42b82047
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-21 13:27:40 +01:00
Tobias Hunger
cb02dd812a CMake: Use default build directory
Change-Id: Ic7916c1ebe0f58ec61d47f1b87891263cce0f6c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-21 13:27:08 +01:00
Tobias Hunger
75c36c9bb5 Gcc: Support -stdlib=whatever arguments for the code model
Switching the stdlib implementation is possible with clang and results
in different include pathes being used (and potentially different defines).

Change-Id: I9c856256f51ceded9dc7892c1dde2bcc8c1b024c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-21 12:48:12 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 08:57:35 +01:00