Significantly improve the build time for the manualtests

- share moc and object files for the manualtests with arora - Build less when possible - Include specific qt includes rather then all of <Qt/Gui> etc
EndorphinBrowser · Mar 23, 2009 · a862efc · a862efc
1 parent 2063998
commit a862efc
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 32 deletions.
diff --git a/manualtests/bookmarks/bookmarks.pro b/manualtests/bookmarks/bookmarks.pro
@@ -7,5 +7,5 @@ include(../manualtests.pri)
 include(../../autotests/modeltest/modeltest.pri)
 
 # Input
-SOURCES += main.cpp
+SOURCES += main_bookmarks.cpp
 HEADERS +=
diff --git a/manualtests/bookmarks/main.cpp → manualtests/bookmarks/main_bookmarks.cpp b/manualtests/bookmarks/main.cpp → manualtests/bookmarks/main_bookmarks.cpp
diff --git a/manualtests/downloadmanager/downloadmanager.pro b/manualtests/downloadmanager/downloadmanager.pro
@@ -6,5 +6,6 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
-SOURCES += main.cpp
+RESOURCES =
+SOURCES += main_downloadmanager.cpp
 HEADERS +=
diff --git a/manualtests/downloadmanager/main.cpp → .../downloadmanager/main_downloadmanager.cpp b/manualtests/downloadmanager/main.cpp → .../downloadmanager/main_downloadmanager.cpp
diff --git a/manualtests/googlesuggest/googlesuggest.pro b/manualtests/googlesuggest/googlesuggest.pro
@@ -9,6 +9,7 @@ include(../../install.pri)
 QT = core network
 
 # Input
+RESOURCES =
 FORMS =
-SOURCES = main.cpp googlesuggest.cpp
+SOURCES = main_googlesuggest.cpp googlesuggest.cpp
 HEADERS = googlesuggest.h
diff --git a/manualtests/googlesuggest/main.cpp → ...ests/googlesuggest/main_googlesuggest.cpp b/manualtests/googlesuggest/main.cpp → ...ests/googlesuggest/main_googlesuggest.cpp
@@ -17,7 +17,11 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <QtCore/QtCore>
+#include <qtimer.h>
+#include <qtextstream.h>
+#include <qcoreapplication.h>
+#include <qstringlist.h>
+#include <qdebug.h>
 #include <qnetworkaccessmanager.h>
 
 #include "googlesuggest.h"
@@ -76,5 +80,5 @@ int main(int argc, char **argv)
     return application.exec();
 }
 
-#include "main.moc"
+#include "main_googlesuggest.moc"
 
diff --git a/manualtests/history/history.pro b/manualtests/history/history.pro
@@ -7,5 +7,5 @@ include(../manualtests.pri)
 include(../../autotests/modeltest/modeltest.pri)
 
 # Input
-SOURCES += main.cpp
+SOURCES += main_history.cpp
 HEADERS +=
diff --git a/manualtests/history/main.cpp → manualtests/history/main_history.cpp b/manualtests/history/main.cpp → manualtests/history/main_history.cpp
diff --git a/manualtests/lineedit/lineedit.pro b/manualtests/lineedit/lineedit.pro
@@ -6,6 +6,7 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
+RESOURCES =
 FORMS   = dialog.ui
-SOURCES = main.cpp lineedit.cpp
+SOURCES = main_lineedit.cpp lineedit.cpp
 HEADERS = lineedit.h lineedit_p.h proxystyle.h
diff --git a/manualtests/lineedit/main.cpp → manualtests/lineedit/main_lineedit.cpp b/manualtests/lineedit/main.cpp → manualtests/lineedit/main_lineedit.cpp
@@ -17,7 +17,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <QtGui>
+#include <qtoolbutton.h>
+#include <qdebug.h>
 
 #include <lineedit.h>
 #include "ui_dialog.h"
@@ -137,5 +138,5 @@ int main(int argc,char ** argv)
     }
 }
 
-#include "main.moc"
+#include "main_lineedit.moc"
 
diff --git a/manualtests/locationbar/locationbar.pro b/manualtests/locationbar/locationbar.pro
@@ -6,6 +6,6 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
-SOURCES += main.cpp
+SOURCES += main_locationbar.cpp
 HEADERS +=
 
diff --git a/manualtests/locationbar/main.cpp → manualtests/locationbar/main_locationbar.cpp b/manualtests/locationbar/main.cpp → manualtests/locationbar/main_locationbar.cpp
diff --git a/manualtests/manualtests.pri b/manualtests/manualtests.pri
@@ -2,10 +2,3 @@ win32: CONFIG += console
 mac:CONFIG -= app_bundle
 
 include($$PWD/../src/src.pri)
-
-RCC_DIR     = $$PWD/.rcc
-UI_DIR      = $$PWD/.ui
-
-# can't share main.cpp objects of course
-OBJECTS_DIR = .obj
-MOC_DIR     = .moc
diff --git a/manualtests/modelmenu/main.cpp → manualtests/modelmenu/main_modelmenu.cpp b/manualtests/modelmenu/main.cpp → manualtests/modelmenu/main_modelmenu.cpp
@@ -93,5 +93,5 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "main.moc"
+#include "main_modelmenu.moc"
 
diff --git a/manualtests/modelmenu/modelmenu.pro b/manualtests/modelmenu/modelmenu.pro
@@ -6,5 +6,5 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
-SOURCES += main.cpp
+SOURCES += main_modelmenu.cpp
 HEADERS +=
diff --git a/manualtests/searchlineedit/main.cpp → ...ts/searchlineedit/main_searchlineedit.cpp b/manualtests/searchlineedit/main.cpp → ...ts/searchlineedit/main_searchlineedit.cpp
diff --git a/manualtests/searchlineedit/searchlineedit.pro b/manualtests/searchlineedit/searchlineedit.pro
@@ -6,5 +6,9 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
-SOURCES += main.cpp
-HEADERS +=
+RESOURCES =
+FORMS =
+SOURCES = searchbutton.cpp clearbutton.cpp lineedit.cpp searchlineedit.cpp
+HEADERS = searchbutton.h clearbutton.h lineedit.h lineedit_p.h searchlineedit.h
+
+SOURCES += main_searchlineedit.cpp
diff --git a/manualtests/singleapplication/main.cpp → ...gleapplication/main_singleapplication.cpp b/manualtests/singleapplication/main.cpp → ...gleapplication/main_singleapplication.cpp
@@ -26,7 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#include <QtGui>
+#include <qplaintextedit.h>
+#include <qdebug.h>
 
 #include <singleapplication.h>
 

diff --git a/manualtests/singleapplication/singleapplication.pro b/manualtests/singleapplication/singleapplication.pro
@@ -6,5 +6,7 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
-SOURCES = main.cpp singleapplication.cpp
-HEADERS = singleapplication.h
+RESOURCES =
+FORMS =
+SOURCES = main_singleapplication.cpp singleapplication.cpp
+HEADERS = singleapplication.h
diff --git a/manualtests/squeezelabel/main.cpp → ...ltests/squeezelabel/main_squeezelabel.cpp b/manualtests/squeezelabel/main.cpp → ...ltests/squeezelabel/main_squeezelabel.cpp
@@ -17,7 +17,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <QtGui/QtGui>
+#include <qapplication.h>
+
 #include "squeezelabel.h"
 
 int main(int argc, char **argv)

diff --git a/manualtests/squeezelabel/squeezelabel.pro b/manualtests/squeezelabel/squeezelabel.pro
@@ -6,5 +6,7 @@ INCLUDEPATH += .
 include(../manualtests.pri)
 
 # Input
-SOURCES = main.cpp squeezelabel.cpp
+RESOURCES =
+FORMS =
+SOURCES = main_squeezelabel.cpp squeezelabel.cpp
 HEADERS = squeezelabel.h
diff --git a/manualtests/webviewsearch/main.cpp → ...ests/webviewsearch/main_webviewsearch.cpp b/manualtests/webviewsearch/main.cpp → ...ests/webviewsearch/main_webviewsearch.cpp
@@ -78,4 +78,4 @@ int main(int argc, char **argv)
     return application.exec();
 }
 
-#include "main.moc"
+#include "main_webviewsearch.moc"
diff --git a/manualtests/webviewsearch/webviewsearch.pro b/manualtests/webviewsearch/webviewsearch.pro
@@ -5,5 +5,5 @@ INCLUDEPATH += .
 
 include(../manualtests.pri)
 
-SOURCES += main.cpp
+SOURCES += main_webviewsearch.cpp
 HEADERS +=
diff --git a/src/src.pri b/src/src.pri
@@ -7,10 +7,10 @@ win32 : Debug : CONFIG += console
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
-RCC_DIR = .rcc
-UI_DIR = .ui
-MOC_DIR = .moc
-OBJECTS_DIR = .obj
+RCC_DIR     = $$PWD/.rcc
+UI_DIR      = $$PWD/.ui
+MOC_DIR     = $$PWD/.moc
+OBJECTS_DIR = $$PWD/.obj
 
 QT += webkit network