AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dead code relating MakeItem

Browse Source 
Change-Id: I413f038391dba02a22242eafef4a946f81babfca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-06-19 16:43:15 +02:00
parent 84ee3ace0e
commit 4718456617
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/configure/configureapp.cpp
View File

@ -311,11 +311,6 @@ Configure::Configure(int& argc, char** argv)
Configure::~Configure()
{
for (int i=0; i<3; ++i) {
QList<MakeItem*> items = makeList[i];
for (int j=0; j<items.size(); ++j)
delete items[j];
}
}
QString Configure::formatPath(const QString &path)
@ -4133,16 +4128,6 @@ void Configure::buildQmake()
}
void Configure::appendMakeItem(int inList, const QString &item)
{
QString dir;
if (item != "src")
dir = "/" + item;
dir.prepend("/src");
makeList[inList].append(new MakeItem(sourcePath + dir,
item + ".pro", buildPath + dir + "/Makefile", Lib));
}
void Configure::generateMakefiles()
{
QString pwd = QDir::currentPath();

23
tools/configure/configureapp.h
View File

@ -49,8 +49,6 @@
QT_BEGIN_NAMESPACE
class MakeItem;
class Configure
{
public:
@ -73,7 +71,6 @@ public:
void generateCachefile();
void displayConfig();
void generateMakefiles();
void appendMakeItem(int inList, const QString &item);
void generateConfigfiles();
void detectArch();
void generateQConfigPri();
@ -129,10 +126,6 @@ private:
QStringList qmakeVars;
QStringList qmakeDefines;
// makeList[0] for qt and qtmain
// makeList[1] for subdirs and libs
// makeList[2] for the rest
QList<MakeItem*> makeList[3];
QStringList qmakeIncludes;
QStringList qmakeLibs;
QString opensslLibs;
@ -177,22 +170,6 @@ private:
void applySpecSpecifics();
};
class MakeItem
{
public:
MakeItem( const QString &d, const QString &p, const QString &t, Configure::ProjectType qt )
: directory( d ),
proFile( p ),
target( t ),
qmakeTemplate( qt )
{ }
QString directory;
QString proFile;
QString target;
Configure::ProjectType qmakeTemplate;
};
class FileWriter : public QTextStream
{
public: