Jo Asplin 97e6d6c5d4 Add other.pro back to auto.pro ... The other/ subdirectory should still be built via other.pro. This was overlooked by Commit 0a208dd413 Task-number: QTBUG-21327 Change-Id: Ie8ebd7dfc5b1dd56ca1b629aa011d160cb563ddd Reviewed-on: http://codereview.qt-project.org/4526 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>		2011-09-12 10:11:34 +02:00
..
bic	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
collections	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
compilerwarnings/data	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
corelib	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
dbus	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
exceptionsafety	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
exceptionsafety_objects	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
gestures	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
gui	Disambiguated access to touch event API in QTestLib	2011-09-08 16:00:30 +02:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
lancelot	Merge remote branch 'gerrit/master' into HEAD	2011-09-06 10:55:40 +02:00
languagechange	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
macgui	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
macnativeevents	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
macplist	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
modeltest	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
network	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
networkselftest	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
opengl	Moved autotests in category 'opengl' into new directory structure	2011-09-09 10:32:38 +02:00
other	Moved autotests in category 'other' into new directory structure	2011-09-09 09:36:41 +02:00
qabstractbutton	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qabstractitemview	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qabstractprintdialog	test: fix tst_qabstractprintdialog compilation	2011-08-24 13:53:13 +02:00
qabstractproxymodel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qabstractscrollarea	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qabstractslider	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qabstractspinbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qaccessibility	Fix further test builds on Windows.	2011-08-31 15:22:35 +02:00
qaccessibility_mac	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qaction	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qactiongroup	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qapplication	Fix typo in qapplication test	2011-08-15 14:45:17 +02:00
qboxlayout	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qbuttongroup	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qcalendarwidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qcheckbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qcolordialog	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qcolumnview	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qcombobox	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qcommandlinkbutton	Merge remote branch 'gerrit/master' into refactor	2011-07-06 14:08:02 +02:00
qcompleter	Merge remote-tracking branch 'base/master' into refactor	2011-06-01 15:34:58 +02:00
qcomplextext	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qcopchannel	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qdatawidgetmapper	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdatetimeedit	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdesktopwidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdial	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdialog	Merge remote branch 'gerrit/master' into refactor	2011-08-03 11:03:22 +02:00
qdialogbuttonbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdirectpainter	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qdirmodel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdockwidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdoublespinbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qdoublevalidator	Merge remote branch 'gerrit/master' into refactor	2011-08-03 11:03:22 +02:00
qerrormessage	Merge remote-tracking branch 'base/master' into refactor	2011-06-01 15:34:58 +02:00
qfiledialog	Merge remote branch 'gerrit/master' into refactor	2011-08-29 12:11:53 +02:00
qfiledialog2	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qfileiconprovider	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qfilesystemmodel	Merge remote branch 'gerrit/master' into refactor	2011-08-03 11:03:22 +02:00
qfocusevent	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qfocusframe	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qfontcombobox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qfontdialog	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qformlayout	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicsanchorlayout	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
qgraphicsanchorlayout1	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicseffect	Fixed tst_graphicseffect auto-test failures.	2011-09-07 08:35:48 +02:00
qgraphicseffectsource	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicsgridlayout	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgraphicsitem	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgraphicsitemanimation	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicslayout	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qgraphicslayoutitem	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicslinearlayout	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicsobject	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicspixmapitem	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicspolygonitem	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicsproxywidget	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgraphicsscene	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qgraphicssceneindex	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qgraphicstransform	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgraphicsview	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgraphicswidget	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgridlayout	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qgroupbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qheaderview	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qidentityproxymodel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qinputcontext	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qinputdialog	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qintvalidator	Add notify signals for QIntvalidator, QDoubleValidator, QRegExpValidator	2011-07-29 02:21:16 +02:00
qitemdelegate	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qitemeditorfactory	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qitemselectionmodel	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qitemview	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qlabel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qlayout	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qlcdnumber	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qlineedit	Merge remote branch 'gerrit/master' into HEAD	2011-09-06 10:55:40 +02:00
qlistview	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
qlistwidget	Merge remote branch 'gerrit/master' into refactor	2011-08-29 12:11:53 +02:00
qmacstyle	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qmainwindow	Add core-private to the qmainwindow autotest	2011-06-29 16:36:44 +02:00
qmdiarea	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qmdisubwindow	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
qmenu	Merge remote branch 'gerrit/master' into refactor	2011-08-29 12:11:53 +02:00
qmenubar	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qmessagebox	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
qmultiscreen	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qnetworkaccessmanager_and_qprogressdialog	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qobjectperformance	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qobjectrace	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qopengl	Fixed build error in tst_qopengl	2011-09-09 14:59:44 +02:00
qplaintextedit	Fix compilation	2011-06-27 14:21:13 +02:00
qprogressbar	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qprogressdialog	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qpushbutton	Merge remote branch 'gerrit/master' into refactor	2011-07-06 14:08:02 +02:00
qradiobutton	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qregexpvalidator	Add notify signals for QIntvalidator, QDoubleValidator, QRegExpValidator	2011-07-29 02:21:16 +02:00
qs60mainapplication	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qscrollarea	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qscrollbar	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qscroller	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qsharedpointer_and_qwidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qsidebar	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qsizegrip	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qslider	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qsoftkeymanager	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qsortfilterproxymodel	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
qsound	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qspinbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qsplitter	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qsslsocket_onDemandCertificates_member	tests: mark expected failures in qsslsocket_onDemandCertificates	2011-08-18 05:53:42 +02:00
qsslsocket_onDemandCertificates_static	tests: mark expected failures in qsslsocket_onDemandCertificates	2011-08-18 05:53:42 +02:00
qstackedlayout	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstackedwidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstandarditem	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstandarditemmodel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstatusbar	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstringlistmodel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstyle	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstyleoption	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qstylesheetstyle	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
qsystemtrayicon	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qtabbar	Fix autotests to build on Windows.	2011-08-31 13:26:27 +02:00
qtableview	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qtablewidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qtabwidget	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qtextbrowser	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qtextedit	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qtoolbar	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qtoolbox	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qtoolbutton	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
qtooltip	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qtransformedscreen	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qtreeview	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qtreewidget	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qtreewidgetitemiterator	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qundogroup	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qundostack	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qwidget	Compilation of tst_qwidget.cpp.	2011-07-29 16:34:28 +02:00
qwidget_window	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qwidgetaction	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qwindow	QWindow::mapToGlobal/mapFromGlobal and move()	2011-08-29 08:30:00 +02:00
qwindowsurface	Merge branch 'master' into refactor	2011-08-25 12:48:52 +02:00
qwizard	Merge remote branch 'gerrit/master' into refactor	2011-07-12 12:52:22 +02:00
qworkspace	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
qwsembedwidget	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
qwsinputmethod	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qwswindowsystem	Doc: Fixing typo	2011-07-07 10:44:07 +02:00
qx11info	tests: Mark failing autotests as "insignificant" for now	2011-07-19 13:11:32 +02:00
sql	Moved sql autotests into new directory structure	2011-09-06 09:32:15 +02:00
symbian	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
testlib	Moved autotests in category 'testlib' into new directory structure	2011-09-12 08:36:15 +02:00
tools	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
uiloader	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
utf8	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
v8	Add missing license header.	2011-09-08 02:54:22 +02:00
windowsmobile	Fix further test builds on Windows.	2011-08-31 15:22:35 +02:00
xml	Moved xml autotests into new directory structure	2011-09-06 10:31:40 +02:00
auto.pro	Add other.pro back to auto.pro	2011-09-12 10:11:34 +02:00
corelib.pro	Moved autotests in category 'testlib' into new directory structure	2011-09-12 08:36:15 +02:00
gui.pro	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
host.pro	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00
network-settings.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
network.pro	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
other.pro	Add other.pro back to auto.pro	2011-09-12 10:11:34 +02:00
platformquirks.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
qtextbrowser.html	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
solutions.pri	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
test.pl	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
v8.pro	Make sure tests/auto/v8.pro doesn't clobber auto.pro	2011-08-31 01:17:39 +02:00