feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,661 Commits 108 Branches 368 Tags
ed842542a5ca6a2ff700c70996856210ab666eef
Commit Graph

43 Commits

Author SHA1 Message Date
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h 
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2011-08-31 13:48:00 +02:00
con
c699740f9f Version bump. 
Change-Id: I6c284e1b18388a2f9e1bad2ef0802b75d5124975
 2011-06-29 00:36:09 +02:00
Oswald Buddenhagen
71baeb1d77 Merge remote-tracking branch 'origin/2.2' 2011-03-15 18:01:35 +01:00
Thiago Macieira
4615a8f88c Make sure plugins on Linux resolve all dependencies 
Remove the previous code which hardcoded options and didn't work for
linux-icc.

Reviewed-By: dt
 2011-03-15 12:50:59 +01:00
con
476223cdd6 Merge remote branch 'origin/2.2' 2011-03-11 09:26:43 +01:00
Tobias Hunger
75f819848f Symbian: Remove S60devices 
Remove S60devices and all the code surrounding it. This gets rid of
the S60 devices tab in the options dialog, too.

Tasknumber: QTCREATORBUG-3681
Reviewed-by: dt
 2011-03-10 16:04:42 +01:00
Oswald Buddenhagen
7007326837 clean up DEPENDPATH insanity 
simply add
  CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
 2011-03-09 22:24:13 +01:00
Tobias Hunger
b168b15978 Symbian: Remove S60devices 
Remove S60devices and all the code surrounding it. This gets rid of
the S60 devices tab in the options dialog, too.

Tasknumber: QTCREATORBUG-3681
 2011-03-09 12:27:28 +01:00
con
663a94daf9 Version bump. 2011-03-07 20:37:26 +01:00
con
740743dc25 Implement an external tool container + xml parsing. 2011-02-18 17:15:34 +01:00
dt
4160e9557c Creator: Also warn off undefined symbols on linux-g++ 
Patch by Fabo
 2011-01-21 13:35:22 +01:00
con
bc3a1ca294 Mac: Explicitly do a 10.5+ build if not doing a tiger compatible build. 
Qt for some reason doesn't tell the tool chain to require 10.5 when
doing a cocoa build but on x86.
 2010-11-18 17:17:25 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build 
... instead of running a sed script over a lot of files on each
version increment.
 2010-11-03 17:47:41 +01:00
con
49b86e7717 Mac: Use rpath instead of executable_path. 
Because executable_path and loader_path are just too inflexible for some
stuff. The rpath is supposed to be set to the Qt Creator app's Contents
folder.
Compiling on 10.4 now requires to enter compatibility mode via
QTC_TIGER_COMPAT env variable or TIGER_COMPAT_MODE qmake variable.
 2010-11-01 15:00:25 +01:00
Kai Koehne
cb48aad9d2 QmlDesigner: Improve Qt version check in plugins.pro 
Reviewed-by: Thomas Hartmann
 2010-09-29 16:44:52 +02:00
Oswald Buddenhagen
d4ea3f523b add include guard for qtcreator.pri 
this also covers the higher-level includes for libs and plugins
 2010-09-10 11:05:19 +02:00
Lasse Holmstedt
5b4a85dffe QML Observer: reverted hack, fixed compilation for ibmake 
see 576642a76a for details
 2010-08-05 11:53:12 +02:00
con
af44136e22 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
 2010-06-24 11:40:22 +02:00
dt
2bd2373b38 Remove LD_LIBRARY_PATH script. 
Christian Kamm convinced me that it should not have any effect.

Reviewed-By: ckamm

Task-Nr: QTCREATORBUG-1646
 2010-06-22 12:47:04 +02:00
con
e4871393c6 QmlJS: Fix target directory for qmldump executable on Mac. 
Reviewed-by: ckamm
 2010-06-10 10:25:58 +02:00
Kai Koehne
b7ae49161a Revert disabling of qml support (2.0.0 branch) 
This reverts commit 5234c775f7 and 210652912b.
 2010-06-07 17:30:18 +02:00
Christian Kamm
5234c775f7 Make the QmlJSEditor work when Qml support is disabled. 
- Enable qmlprojectplugin even if Qml support is disabled.
- But disable its wizards in that case.
- Disable the Qml file wizard if the support is off.

Reviewed-by: Kai Koehne
 2010-06-03 10:25:17 +02:00
con
b610cc949f Turn Symbian support on for Linux by default. 
Requested-by: Friedemann Kleint
 2010-04-07 11:09:01 +02:00
Kai Koehne
f8a9e0999b Fix compiler warnings with MVSC2008 2010-03-17 12:38:44 +01:00
Oswald Buddenhagen
8494afba64 QT_USE_FAST_OPERATOR_PLUS still breaks *some* macs ... 
... so just disable it for all macs.
 2010-02-11 10:41:03 +01:00
Oswald Buddenhagen
d4ac9c9f8e re-enable QT_USE_FAST_CONCATENATION 
includes workaround for breakage with old g++
 2010-02-08 13:00:57 +01:00
Kai Koehne
6c4b9ba227 Reapply unconnected changes from reverted commit 
Only revert stuff that is linked to fast string concat.
 2010-02-08 11:13:55 +01:00
Kai Koehne
999c73ad9d Revert "compile everything with QT_USE_FAST_CONCATENATION" 
This reverts commit e70530c5ad. It
did break builds on older gcc versions (gcc 4.1.2 64 bit Linux,
gcc 4.0.1 on Mac OS X):

parser/qmljsgrammar_p.h: In static member function ???static int
QmlJSGrammar::nt_action(int, int)???:
parser/qmljsgrammar_p.h:188: error: ???QmlJSGrammar::<anonymous enum>???
is/uses anonymous type
parser/qmljsgrammar_p.h:188: error:   trying to instantiate
???template<class T> struct QConcatenable???
...
 2010-02-08 10:56:50 +01:00
Oswald Buddenhagen
e70530c5ad compile everything with QT_USE_FAST_CONCATENATION 2010-02-05 15:20:25 +01:00
Oswald Buddenhagen
4ed8902f51 do not break on mingw with sh in PATH 2009-11-24 20:43:58 +01:00
Oswald Buddenhagen
c13d934b37 macx: compile doc into the right directory instead of copying it later 2009-11-24 20:43:55 +01:00
dt
8353f29474 Fix wrong scoping in qtcreator.pri 
Reported-By: Tasuku Suzuki
 2009-10-23 12:37:53 +02:00
Daniel Molkentin
b262472973 Centralize S60 check, also use it for adding the GDB TRK page. 2009-10-06 14:43:05 +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
hjk
7786f8af8d prepare for use of QStringBuilder 2009-06-08 15:54:27 +02:00
hjk
957a8f3479 debugger: some encoding correctness 2009-05-29 10:35:29 +02:00
dt
a8aa5c8219 Remove logic trying to guess whether it should be lib or lib64. 
Instead use qmake IDE_LIBRARY_BASENAME=lib64 to set it to lib64.
 2009-05-12 16:24:13 +02:00
con
643d4b94f4 Make it possible to override IDE_BUILD_TREE. 
This is helpfull for building plugins from outside
the QtCreator source tree.
 2009-05-11 12:38:20 +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
Oswald Buddenhagen
e3885f280b use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH 
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
 2009-05-06 20:25:20 +02:00
Oswald Buddenhagen
97ffee6bdd automate setting IDE_BUILD_TREE 2009-05-06 20:25:20 +02:00
Oswald Buddenhagen
13f04d8430 revamp build system 
now bin and share are not pegged to linking the executable any more,
but are proper subdirs targets of their own.
unforturnately, qmake is a bit tenacious, so we hack around a bit. :)

more or less in passing by, i removed some superfluous trailing slashes
and added path normalization as well.
 2009-04-20 16:51:10 +02:00