Commit Graph

2048 Commits

Author SHA1 Message Date
Rohan McGovern
eacb27f1fb Fixed transient compile failure with highly parallel jom.
These .pri files which add to INCLUDEPATH and have FORMS should also add
to DEPENDPATH.

Adding to INCLUDEPATH does not add to DEPENDPATH by default with qmake.
That means qmake may not find headers in those paths and won't
consider them dependencies when compiling the source files which include
them.

This doesn't matter when all the headers in the new INCLUDEPATH are
always present, but when some of them are generated (e.g. from FORMS),
the dependencies are important and omitting them means a race condition
in parallel builds.

Fixes errors of the form:
  ..\..\shared\help\topicchooser.h(33) : fatal error C1083: Cannot open
    include file: 'ui_topicchooser.h': No such file or directory
(cherry picked from commit 9a7e02946a)
2009-10-12 11:11:01 +02:00
con
7ecbfbe6d2 Merge commit 'origin/1.3' 2009-10-09 20:15:17 +02:00
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac.
Since that was fixed in Qt.
2009-10-09 13:33:56 +02:00
Rohan McGovern
9a7e02946a Fixed transient compile failure with highly parallel jom.
These .pri files which add to INCLUDEPATH and have FORMS should also add
to DEPENDPATH.

Adding to INCLUDEPATH does not add to DEPENDPATH by default with qmake.
That means qmake may not find headers in those paths and won't
consider them dependencies when compiling the source files which include
them.

This doesn't matter when all the headers in the new INCLUDEPATH are
always present, but when some of them are generated (e.g. from FORMS),
the dependencies are important and omitting them means a race condition
in parallel builds.

Fixes errors of the form:
  ..\..\shared\help\topicchooser.h(33) : fatal error C1083: Cannot open
    include file: 'ui_topicchooser.h': No such file or directory
2009-10-08 12:26:47 +02:00
Erik Verbruggen
49f6b740cd Merge remote branch 'origin/1.3'
Conflicts:
	src/libs/cplusplus/CheckUndefinedSymbols.cpp
	src/plugins/qmleditor/qmlcodecompletion.cpp
2009-10-06 11:41:00 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
con
b19d76d903 Version bump. 2009-10-02 16:27:03 +02:00
con
1de6a6e716 Version bump. 2009-10-02 16:21:39 +02:00
Friedemann Kleint
9d4aafebac VCS/git: Make blame go to current editor line
using queued slot/variant cookie magic in command
2009-10-01 17:50:24 +02:00
Friedemann Kleint
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +02:00
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII
.. and purge unneeded includes.
2009-09-29 11:39:55 +02:00
Friedemann Kleint
e653b7054a git: Remove duplicate action. 2009-09-25 13:46:49 +02:00
Friedemann Kleint
77fc7441af Git: Remove dpulicate slot revert(), move to UndoFileChanges. 2009-09-25 12:41:13 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
Friedemann Kleint
25a546e3ea Git:: Prompt before doing hard reset. 2009-09-24 13:58:08 +02:00
Friedemann Kleint
5aa65b12f3 Version control: Do not keep lock on message file while committing.
Store the file name and do not keep the QTemporaryFile around,
which still seems to maintain some kind of lock on Windows although
it is closed.
2009-09-22 12:23:44 +02:00
con
32e0340eab Version bump. 2009-09-10 17:02:57 +02:00
Friedemann Kleint
40f6f72a5d Git: Make commit work on Windows 2009-08-25 09:57:58 +02:00
Friedemann Kleint
d7c5e2ed24 Version Control: Release the commit message temporary file.
... and add some logging to p4.
2009-08-17 09:49:56 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
188dbc3a43 API naming.
Reviewed-by: hjk
2009-08-12 10:41:30 +02:00
Friedemann Kleint
8dfa8af69b Gitorious Wizard: Add a repository filter field.
... to accommodate for the setup at Nokia.
2009-08-11 14:09:32 +02:00
Friedemann Kleint
1e64d9f9b2 Version control: Replace per-VCS output panes with a single one.
...and give it some color and formatting.
2009-08-10 15:46:45 +02:00
Friedemann Kleint
61123092ab Fixed compiler/lupdate/uic warnings.
Add missing Q_OBJECTS where tr() was used.
2009-07-29 09:11:37 +02:00
Friedemann Kleint
ec0f5172c9 Fixed MSVC warnings. 2009-07-27 09:33:27 +02:00
Friedemann Kleint
96940fa949 Gitorious wizard: Import CMake projects, look in src directory.
Remove unused code.
2009-07-27 09:22:26 +02:00
Friedemann Kleint
b49d715a1c Added a gitorious clone wizard.
... based on the git clone wizard. Provide a wizard for browsing
gitorious hosts.

Task-number:  44831
2009-07-24 13:41:14 +02:00
Friedemann Kleint
9e2f12c737 VCSBase: Add common functionality, make checkout use page lists.
Move GitClient::filterUntrackedFilesOfProject into submit editor.
Make checkout wizards use page lists for greater flexibility.
2009-07-21 11:14:48 +02:00
Friedemann Kleint
b488deeb0c CVS: Add checkout wizard. 2009-07-20 09:23:00 +02:00
Friedemann Kleint
9f14b79cc6 Add a clone wizard for version control (base classes + git/svn).
Task-number: 244831
2009-07-17 17:19:23 +02:00
Friedemann Kleint
41a9395d21 Optionally shorten git blame output by removing date+line number. 2009-07-15 15:18:03 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED
There were both variants, with and without extra semicolon.
2009-07-13 17:35:17 +02:00
Friedemann Kleint
2508fa03a0 Make the "prompt to submit" setting a per-plugin one.
Provide a checkable message box to be able to turn
prompting off when asked.
2009-06-19 16:34:38 +02:00
dt
4637d56284 Don't ask to reload the file, if the user uses git/undo or git/revert.
Simply do it.

Task-Nr: 254558
2009-06-18 14:30:04 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
con
4f4f767b2b Merge commit 'origin/1.2' 2009-06-16 14:58:28 +02:00
Daniel Molkentin
5a6c636935 Run git on windows properly when git is called synchronously.
Reviewed-By: Friedemann Kleint
2009-06-15 14:04:14 +02:00
Roberto Raggi
d08b90b494 Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-11 11:32:47 +02:00
dt
8ef7ad0b62 Fix not beeing able to commit file deletions with creators git plugin
Reviewed-By: mauricek
2009-06-10 18:10:34 +02:00
con
57cd26548e Version bump also in master. 2009-06-04 11:00:28 +02:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
2009-06-03 20:54:59 +02:00
Daniel Molkentin
b17fe748bb It may come as a total surprise, but Unix doesn't like cmd.exe :-D
Reviewed-By: Ossi
2009-06-02 19:38:13 +02:00
con
e9b2613dc0 Version bump. 2009-06-02 15:34:58 +02:00
Daniel Molkentin
64e925d2be Fix for recent git version where git.exe became git.cmd.
Run git as a cmd.exe subprocess as a workaround. In the long term
we should look into enabling QProcess to properly handle .bat and
.cmd files.

Reviewed-By: Ossi
2009-06-02 12:23:57 +02:00
Friedemann Kleint
07e589ef8e Fixed b390e56d67
Do not check for existence of the binary, breaks on Windows
due to .exe (and potentially paths). Use waitForStarted().
On this occasion, kill on timeout in case of password prompts.
2009-05-29 11:34:06 +02:00
Lorn Potter
b390e56d67 Fixes: don't timeout trying to run git when git cannot be found.
Task:     <task number>
Details:  <additional information>
2009-05-29 08:38:30 +10:00
Friedemann Kleint
e38250d81f Close write channels of git processes.
..in an attempt to suppress password prompts.
2009-05-28 12:27:04 +02:00
Friedemann Kleint
e5c6a29fc4 Raise existing submit window if there is one when Submit is invoked.
Introduce convenience to VCSBaseSubmitEditor.
Task-number: 254644
2009-05-27 16:17:24 +02:00
Friedemann Kleint
81d69641ab Added ParameterAction class for QActions acting on files.
Reduce inconsistencies in tr()-Strings provided for
QActions that act on a current <something> (mostly files) by
introducing a ParameterAction class that takes the tr()-Strings
at construction time and provides a setParameter(QString) slot,
allows for setting that parameter or an empty string, which
will cause the displayed text to be updated.
2009-05-15 15:41:00 +02:00
Enrico Ros
bca4d9698d Remove unneeded strings from translation. 2009-05-11 18:29:49 +02:00