feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
0a59f347946a44583dc4f6271bbfa93b481d84dd
qt-creator/qtcreator.pro

31 lines
701 B
Prolog
Raw Normal View History

Update Qt requirement. Change-Id: I8d3eb57a3cb41c4bfd01defc3f5c512a46a7a428 Reviewed-on: http://codereview.qt.nokia.com/1652 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-07-14 10:15:36 +02:00
include(qtcreator.pri)
Fixes: Move qt version check to qtcreator.pro RevBy: con
2008-12-18 16:19:50 +01:00
#version check qt
Update Qt requirement. Change-Id: I8d3eb57a3cb41c4bfd01defc3f5c512a46a7a428 Reviewed-on: http://codereview.qt.nokia.com/1652 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-07-14 10:15:36 +02:00
!minQtVersion(4, 7, 4) {
Fixed printing of the current Qt version number The final dot was confusing qmake, apparently considered part of the variable name.
2009-11-14 13:58:09 +01:00
message("Cannot build Qt Creator with Qt version $${QT_VERSION}.")
Update Qt requirement. Change-Id: I8d3eb57a3cb41c4bfd01defc3f5c512a46a7a428 Reviewed-on: http://codereview.qt.nokia.com/1652 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-07-14 10:15:36 +02:00
error("Use at least Qt 4.7.4.")
Fixes: Move qt version check to qtcreator.pro RevBy: con
2008-12-18 16:19:50 +01:00
}
Fixes: make install workd Details: Make install works now, we just have to agree on layout details and check for mac compatibility. Also, plugins will carry no version in their filename anymore starting with this commit. Versioning happens in the creators pluginloader using the pluginspec file.
2009-01-20 14:58:10 +01:00
include(doc/doc.pri)
More work toward make install on Linux.
2009-01-19 11:01:45 +01:00
Initial import
2008-12-02 12:01:29 +01:00
TEMPLATE = subdirs
CONFIG += ordered
Make Components installable. Fix Shadow Build. Task-Number: QTCREATORBUG-5672 Done-with: Oswald Buddenhagen Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004 Reviewed-on: http://codereview.qt.nokia.com/2451 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-08-02 17:11:29 +02:00
SUBDIRS = src share lib/qtcreator/qtcomponents
re-add LD_LIBRARY_PATH script we need to override RUNPATHs from possible plugins. due to d7d23226, this should not re-introduce QTCREATORBUG-1646. unlike in the previous incarnation, we don't replace the binary with the script, but give the script an extension. this is nicer for packagers and less confusing in creator's own run configurations. the .desktop files created by our installers need to be adjusted for that. Task-number: QTCREATORBUG-5565 Change-Id: Icd2fa55456754a05257376b8288e8bdf423c62db Reviewed-on: http://codereview.qt.nokia.com/3180 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-08-18 13:03:12 +02:00
unix:!macx:!isEmpty(copydata):SUBDIRS += bin
Add dist files to OTHER_FILES Change-Id: I32f525a2478d4442041c52f22f972202ca61f0b8 Reviewed-on: http://codereview.qt.nokia.com/1231 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-07-06 12:56:59 +02:00
OTHER_FILES += dist/copyright_template.txt \
dist/changes-1.1.0 \
dist/changes-1.1.1 \
dist/changes-1.2.0 \
dist/changes-1.2.1 \
dist/changes-1.3.0 \
dist/changes-1.3.1 \
dist/changes-2.0.0 \
dist/changes-2.0.1 \
dist/changes-2.1.0 \
dist/changes-2.2.0 \
Add changes-2.4.0 file Change-Id: Ic6b59e9a40134b1e37e64170bcf12388c535014a Reviewed-on: http://codereview.qt-project.org/4794 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-13 16:43:06 +02:00
dist/changes-2.3.0 \
Merge remote-tracking branch 'origin/2.3' Conflicts: qtcreator.pri qtcreator.pro share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp src/plugins/remotelinux/remotelinuxruncontrol.cpp Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
2011-09-15 11:50:29 +02:00
dist/changes-2.3.1 \
Add changes-2.4.0 file Change-Id: Ic6b59e9a40134b1e37e64170bcf12388c535014a Reviewed-on: http://codereview.qt-project.org/4794 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-13 16:43:06 +02:00
dist/changes-2.4.0
Copy Permalink