hjk
|
a322bd606f
|
Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
2011-07-06 11:14:01 +02:00 |
|
Oswald Buddenhagen
|
dc3c156cac
|
Merge branch '2.2'
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
|
2011-04-14 12:39:31 +02:00 |
|
hjk
|
8397663964
|
Update license.
|
2011-04-13 11:49:28 +02:00 |
|
Bill King
|
4e7ad2a1b7
|
tests: Make them compile again properly
|
2011-04-07 09:10:37 +02:00 |
|
Bill King
|
3593fe08ae
|
tests: add licence headers
|
2011-02-18 14:48:16 +01:00 |
|
Bill King
|
df43d55e04
|
Fixes: More autotest cleanup (now release target builds too)
|
2010-12-14 12:56:55 +10:00 |
|
Bill King
|
16dc934a48
|
Fixes autotests for windows.
|
2010-12-14 11:01:17 +10:00 |
|
Roberto Raggi
|
83a7e0f518
|
Print the result of the preprocessor.
|
2009-10-27 11:31:26 +01:00 |
|
Roberto Raggi
|
c4fdda5bd6
|
Compile.
|
2009-06-29 14:31:25 +02:00 |
|
Roberto Raggi
|
45fbbba26c
|
Improved a little bit the example and show how to compute the deps for all the files in QtCore.
|
2009-05-13 18:29:35 +02:00 |
|
Roberto Raggi
|
1575e6836d
|
Show how to use the preprocessor to generate deps.
|
2009-05-13 15:29:59 +02:00 |
|
Roberto Raggi
|
6b9444e150
|
Simple manual test for the preprocessor.
|
2009-03-09 15:49:51 +01:00 |
|