feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,408 Commits 108 Branches 368 Tags
ab85e7342e7b51a10b6bf5ebc66c1a47c70f3fa6
Commit Graph

52 Commits

Author SHA1 Message Date
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX 
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2012-09-25 10:14:51 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)." 
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT). 
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-09-05 16:37:42 +02:00
Orgad Shaneh
5d1dc4b0cd static: List shared files in project tree 
Change-Id: Idd4fcb2c6ad8c9ded449bf25c52f91b1fce4d5d5
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-24 20:20:35 +02:00
Kai Koehne
52d2987e50 Provide qmlviewer in external tools menu 
Quite a few people have asked for previewing a .qml file in qmlviewer,
independent of the current project format.

Change-Id: I2d012282b035cbf977de1994b6c2ace31f3cdfd5
Reviewed-on: http://codereview.qt.nokia.com/2397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-07-29 16:29:58 +02:00
hjk
fda652a43e debugger: rename gdbmacros* to dumper* 
Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-29 10:21:55 +02:00
Daniel Molkentin
497dd323ea Introduce QML-based welcome screen using desktop components 
Implements new XML-based format for examples, demos & tutorials

Done-with: Primrose Mbanefo <ext-primrose.mbanefo@nokia.com>
Change-Id: I42c0afdb419cffe5637cd4f298e828d09e0fb15a
Reviewed-on: http://codereview.qt.nokia.com/840
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-29 00:31:47 +02:00
con
8bc8feed2d "Open Terminal Here" should open Terminal.app on Mac. 
It was starting X11 and a xterm...

Task-number: QTCREATORBUG-4683
 2011-04-27 15:30:26 +02:00
Oswald Buddenhagen
5038ab9f61 exclude plist.in files from the copy targets 
they are handled by QMAKE_SUBSTITUTES where needed

Reviewed-by: con
 2011-03-30 11:00:31 +02:00
Oswald Buddenhagen
3ccee55a5e nothing mac-specific about OTHER_FILES 
Reviewed-by: con
 2011-03-30 11:00:30 +02:00
Oswald Buddenhagen
4c7a8c9a8d install data from src/share/ directory 
Reviewed-by: con
 2011-03-30 11:00:30 +02:00
Oswald Buddenhagen
3e0e5a6086 reshuffle and simplify copying of files from src/share/ 
Reviewed-by: con
 2011-03-30 11:00:30 +02:00
con
530e7494dd Automatic versioning for the qml tools. 
Reviewed-by: Thomas Hartmann
 2011-03-29 17:54:52 +02:00
Robert Loehning
866beee34b Using the same sort command on Unix and Windows 2011-02-28 17:53:03 +01:00
con
e8facd063b Add sort tool for windows. 
Task-number: QTCREATORBUG-3851
 2011-02-28 15:15:33 +01:00
con
eb06482992 Add 'edit in notepad' external tool for windows. 2011-02-18 17:15:37 +01:00
con
c14fd1e0b6 Fix deployment of external tools on Linux/Win 2011-02-18 17:15:37 +01:00
con
3ecced27a3 Start implementing "edit in vi" for mac. 2011-02-18 17:15:36 +01:00
con
dd6f9b066b Ship some example external tools. 2011-02-18 17:15:34 +01:00
con
77f45caee0 Show Qt Creator resources in Locator on Mac 2010-12-17 16:05:47 +01:00
Leandro Melo
898bc97cce Snippets: Make it flexible for adding builtin snippets 
Instead of in one XML embedded as a resource, now builtin
snippets can be specified on any XML distributed under share.
 2010-12-08 17:22:14 +01:00
Leandro Melo
7528c6d617 Snippets: Feature enhancement start... 
Provide an interface so users can create/edit/remove snippets.
 2010-12-08 17:22:07 +01:00
Roberto Raggi
8758bec682 Added declarations for the GLSL builtins. 2010-11-26 14:26:07 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Leandro Melo
a534c271ec Generic highlighter: Add Creator's share folder in the fallback definitions search. 
This leaves the code prepared if we decide to ship some of the Kate XMLs (still
a pending decision). In this case the installer needs to be "notified" and the
Kate files put in the repo.

An addition check for actual XML files in the searched directories is also added.

Reviewed-by: con
Reviewed-by: Thorbjorn Lindeijer
 2010-11-09 16:15:36 +01:00
Friedemann Kleint
92a6255c23 Build system: Fix warning when loading qtcreator.pro into Qt Creator. 
Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-11-08 17:20:40 +01:00
Daniel Molkentin
ac9159f872 Add our own description file to show all possible QML examples. 
Reviewed-By: con
 2010-10-22 14:50:44 +02:00
Leandro Melo
81d40def56 Generic highlighter: Create default dir for definitions on user's area (at runtime). 2010-09-29 14:00:19 +02:00
Lasse Holmstedt
64f980a38b Fixed copying files from share 
Reviewed-by: kkoehne
 2010-09-29 10:07:19 +02:00
Daniel Molkentin
c23ed4b14c Add a dummy RSS file, to be filled with (local) content later 2010-09-24 17:40:22 +02:00
Leandro Melo
80474251d7 Generic highlighter: Add Creator's default folder for definitions. 2010-09-23 17:08:32 +02:00
Kai Koehne
e17d1491c4 QmlJSDebugger: Fix compilation of user programs using the observer on Mac 
Copy the libs to the application bundle.
 2010-09-17 14:40:17 +02:00
Oswald Buddenhagen
9cc4a77886 adjust phony target hacks to gdb_dwarf_index addition in qt master 2010-09-10 11:05:19 +02:00
Leandro Melo
9704844e47 Generic highlighter: Changes in settings. Now there's a fallbacklocation. 
Task-number: QTCREATORBUG-1886
 2010-08-06 13:19:19 +02:00
Kai Koehne
bd5512dc3b QmlOutline: Show icons also on Mac OS X 
Copy them to the .app folder ...
 2010-07-22 14:48:20 +02:00
con
1aeef8d9a1 Mac: The resources target created a phony_target.app directory. 2010-07-16 10:55:30 +02:00
Leandro Melo
6290aa8359 Started mechanism to scan directory, find definition files, and register mime types. 2010-05-14 10:12:22 +02:00
Oswald Buddenhagen
fdf28b5e19 install files without an extension 2010-03-19 12:28:43 +01:00
Erik Verbruggen
13d7612f09 Removed private header dependencies and introduced loading QML types from XML file. 2010-03-01 13:13:02 +01:00
Kai Koehne
818a7b226b New QmlDesigner plugin & Design mode 
This adds a new "Design" mode that can be used to manipulate qml files
in a visual way. It will only get build if you have the declarativeui
module in Qt.

This is a squashed import from the Bauhaus project. Share & enjoy :)
 2010-01-07 12:14:35 +01:00
Daniel Molkentin
e7a477b3a0 Build system: make 'install' target work on Windows. 
Reviewed-By: Oswald Buddenhagen
 2009-09-25 12:31:25 +02:00
Daniel Molkentin
29ecb23342 Windows need quotes, unfortunately. 2009-09-15 17:19:29 +02:00
con
c22e4c7628 It's "Qt Creator" and that should reflect in the App name on Mac. 2009-09-15 14:22:13 +02:00
Roberto Raggi
dbffbe107f Install the color schemes 2009-07-13 14:35:40 +02:00
con
fde603d887 Install data files to right location (Mac). 
Reviewed-by: Oswald Buddenhagen
 2009-06-09 11:55:00 +02:00
Oswald Buddenhagen
d606e1f04a fix data output paths 2009-06-08 15:55:41 +02:00
Oswald Buddenhagen
7ef45a7070 actually compile and link the phony target 
kinda slower, but without error messages.
 2009-06-08 15:55:41 +02:00
Oswald Buddenhagen
3d0189b5a0 hide the scary phony link command 2009-06-02 12:53:12 +02:00
Oswald Buddenhagen
c1dc4394b0 beautify installation of pluginspecs 
use the data copying custom compiler approach here, too.
this leaves more work to qmake, which is good.
on the upside, pluginspecs will be installed when they change without
having force a re-link of the plugin itself.
on the downside, installation of a pluginspec will force a re-link of
the plugin. oh, well - you can't have it all (with qmake) ...
 2009-05-06 20:25:20 +02:00
Oswald Buddenhagen
e47689449d fix shadow build detection 2009-05-06 20:25:20 +02:00